Merge pull request #29 from aajonusonline/main

Add support for absolute paths
This commit is contained in:
Piotr Miller
2021-09-29 22:54:47 +02:00
committed by GitHub

10
main.go
View File

@@ -249,7 +249,9 @@ func main() {
} }
log.Info(fmt.Sprintf("Found %v pinned items", len(pinned))) log.Info(fmt.Sprintf("Found %v pinned items", len(pinned)))
cssFile := filepath.Join(configDirectory, *cssFileName) if !strings.HasPrefix(*cssFileName, "/") {
*cssFileName = filepath.Join(configDirectory, *cssFileName)
}
appDirs = getAppDirs() appDirs = getAppDirs()
@@ -292,12 +294,12 @@ func main() {
cssProvider, _ := gtk.CssProviderNew() cssProvider, _ := gtk.CssProviderNew()
err = cssProvider.LoadFromPath(cssFile) err = cssProvider.LoadFromPath(*cssFileName)
if err != nil { if err != nil {
log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", cssFile) log.Errorf("ERROR: %s css file not found or erroneous. Using GTK styling.", *cssFileName)
log.Errorf("%s", err) log.Errorf("%s", err)
} else { } else {
log.Info(fmt.Sprintf("Using style from %s", cssFile)) log.Info(fmt.Sprintf("Using style from %s", *cssFileName))
screen, _ := gdk.ScreenGetDefault() screen, _ := gdk.ScreenGetDefault()
gtk.AddProviderForScreen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) gtk.AddProviderForScreen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
} }