oliver/nwg-drawer
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for absolute paths

Browse Source 
In reference to https://github.com/nwg-piotr/nwg-bar/issues/1
This commit is contained in:
wtl
2021-09-23 16:05:17 +03:00
parent c974593f77
commit e341759b9e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -8,7 +8,7 @@ get:
go get "github.com/sirupsen/logrus" go get "github.com/sirupsen/logrus"
build: build:
go build -o bin/nwg-drawer *.go go build -o bin/nwg-drawer .
install: install:
mkdir -p /usr/share/nwg-drawer mkdir -p /usr/share/nwg-drawer
@@ -21,5 +21,5 @@ uninstall:
rm /usr/bin/nwg-drawer rm /usr/bin/nwg-drawer
run: run:
go build -o bin/nwg-drawer *.go go build -o bin/nwg-drawer .
bin/nwg-drawer bin/nwg-drawer

10
main.go
View File

@@ -190,7 +190,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()
@@ -216,12 +218,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)
} }