From c0faecdb8bf5bd2c45999221e14c1a094d409f10 Mon Sep 17 00:00:00 2001 From: piotr Date: Thu, 27 Jul 2023 03:27:27 +0200 Subject: [PATCH 1/4] add `-ft` argument --- main.go | 1 + tools.go | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/main.go b/main.go index 426d138..d07b0f8 100644 --- a/main.go +++ b/main.go @@ -127,6 +127,7 @@ var marginLeft = flag.Int("ml", 0, "Margin Left") var marginRight = flag.Int("mr", 0, "Margin Right") var marginBottom = flag.Int("mb", 0, "Margin Bottom") var fsColumns = flag.Uint("fscol", 2, "File Search result COLumns") +var forceTheme = flag.Bool("ft", false, "add GTK_THEME= env var for libadwaita apps; requires gtk4-compatible theme") var columnsNumber = flag.Uint("c", 6, "number of Columns") var itemSpacing = flag.Uint("spacing", 20, "icon spacing") var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"") diff --git a/tools.go b/tools.go index 98a171b..e573554 100644 --- a/tools.go +++ b/tools.go @@ -548,6 +548,15 @@ func savePinned() { } func launch(command string, terminal bool) { + themeToPrepend := "" + // add "GTK_THEME=" environment variable + if *forceTheme { + settings, _ := gtk.SettingsGetDefault() + th, err := settings.GetProperty("gtk-theme-name") + if err == nil { + themeToPrepend = th.(string) + } + } // trim % and everything afterwards if strings.Contains(command, "%") { cutAt := strings.Index(command, "%") @@ -577,6 +586,10 @@ func launch(command string, terminal bool) { cmdIdx = 0 } + if themeToPrepend != "" { + envVars = append(envVars, fmt.Sprintf("GTK_THEME=%s", themeToPrepend)) + } + cmd := exec.Command(elements[cmdIdx], elements[1+cmdIdx:]...) if terminal { From b3fa492b44defa1a159d0e5eb95cd6f7c5ce1186 Mon Sep 17 00:00:00 2001 From: piotr Date: Thu, 27 Jul 2023 03:27:56 +0200 Subject: [PATCH 2/4] bump to 0.3.10 --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index d07b0f8..4b02c7c 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ import ( "github.com/gotk3/gotk3/gtk" ) -const version = "0.3.9" +const version = "0.3.10" var ( appDirs []string From 6656568c6a37be4c2fa1bd65feb0aa78b6e2073e Mon Sep 17 00:00:00 2001 From: piotr Date: Thu, 27 Jul 2023 03:44:29 +0200 Subject: [PATCH 3/4] update `-ft` description --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 4b02c7c..c47a070 100644 --- a/main.go +++ b/main.go @@ -127,7 +127,7 @@ var marginLeft = flag.Int("ml", 0, "Margin Left") var marginRight = flag.Int("mr", 0, "Margin Right") var marginBottom = flag.Int("mb", 0, "Margin Bottom") var fsColumns = flag.Uint("fscol", 2, "File Search result COLumns") -var forceTheme = flag.Bool("ft", false, "add GTK_THEME= env var for libadwaita apps; requires gtk4-compatible theme") +var forceTheme = flag.Bool("ft", false, "Force Theme for libadwaita apps, by adding GTK_THEME= env var") var columnsNumber = flag.Uint("c", 6, "number of Columns") var itemSpacing = flag.Uint("spacing", 20, "icon spacing") var lang = flag.String("lang", "", "force lang, e.g. \"en\", \"pl\"") From ebfaba1881079bde27c0956eead092e389d6ad1f Mon Sep 17 00:00:00 2001 From: piotr Date: Fri, 28 Jul 2023 00:47:27 +0200 Subject: [PATCH 4/4] undo version bump --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index c47a070..0b9d795 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ import ( "github.com/gotk3/gotk3/gtk" ) -const version = "0.3.10" +const version = "0.3.9" var ( appDirs []string