Merge pull request #85 from nwg-piotr/add84

Add `-i` flag to force an icon theme

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: nwg-piotr

main.go

@@ -21,7 +21,7 @@ import (
 	"github.com/gotk3/gotk3/gtk"
 )
 
-const version = "0.3.6"
+const version = "0.3.8"
 
 var (
 	appDirs         []string
@@ -120,6 +120,7 @@ var targetOutput = flag.String("o", "", "name of the Output to display the drawe
 var displayVersion = flag.Bool("v", false, "display Version information")
 var overlay = flag.Bool("ovl", false, "use OVerLay layer")
 var gtkTheme = flag.String("g", "", "GTK theme name")
+var gtkIconTheme = flag.String("i", "", "GTK icon theme name")
 var iconSize = flag.Int("is", 64, "Icon Size")
 var marginTop = flag.Int("mt", 0, "Margin Top")
 var marginLeft = flag.Int("ml", 0, "Margin Left")
@@ -326,6 +327,15 @@ func main() {
 		log.Info("Preferring dark theme variants")
 	}
 
+	if *gtkIconTheme != "" {
+		err = settings.SetProperty("gtk-icon-theme-name", *gtkIconTheme)
+		if err != nil {
+			log.Error("Unable to set icon theme:", err)
+		} else {
+			log.Infof("User demanded icon theme: %s", *gtkIconTheme)
+		}
+	}
+
 	cssProvider, _ := gtk.CssProviderNew()
 
 	err = cssProvider.LoadFromPath(*cssFileName)

tools.go

@@ -691,3 +691,19 @@ func mapOutputs() (map[string]*gdk.Monitor, error) {
 	}
 	return result, nil
 }
+
+// KAdot / https://stackoverflow.com/a/38537764/4040598 - thanks!
+func substring(s string, start int, end int) string {
+	startStrIdx := 0
+	i := 0
+	for j := range s {
+		if i == start {
+			startStrIdx = j
+		}
+		if i == end {
+			return s[startStrIdx:j]
+		}
+		i++
+	}
+	return s[startStrIdx:]
+}

uicomponents.go

@@ -58,9 +58,8 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 				name = entry.Name
 			}
 			if len(name) > 20 {
-				r := []rune(name)
+				r := substring(name, 0, 17)
-				name = string(r[:17])
+				name = fmt.Sprintf("%s…", string(r))
-				name = fmt.Sprintf("%s…", name)
 			}
 			btn.SetLabel(name)
 
@@ -252,9 +251,8 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	button.SetImagePosition(gtk.POS_TOP)
 	name := entry.NameLoc
 	if len(name) > 20 {
-		r := []rune(name[:17])
+		r := substring(name, 0, 17)
-		name = string(r)
+		name = fmt.Sprintf("%s…", string(r))
-		name = fmt.Sprintf("%s…", name)
 	}
 	button.SetLabel(name)
 
@@ -263,9 +261,8 @@ func flowBoxButton(entry desktopEntry) *gtk.Button {
 	terminal := entry.Terminal
 	desc := entry.CommentLoc
 	if len(desc) > 120 {
-		r := []rune(desc[:117])
+		r := substring(desc, 0, 117)
-		desc = string(r)
+		desc = fmt.Sprintf("%s…", string(r))
-		desc = fmt.Sprintf("%s…", desc)
 	}
 	button.Connect("button-release-event", func(btn *gtk.Button, e *gdk.Event) bool {
 		btnEvent := gdk.EventButtonNewFromEvent(e)