Merge pull request #7 from nwg-piotr/fix_pinned

Fix GTK critical warnings on pinned cache file not found

Makefile

@@ -16,6 +16,7 @@ install:
 	cp bin/nwg-drawer /usr/bin
 
 uninstall:
+	rm -r /usr/share/nwg-drawer
 	rm /usr/bin/nwg-drawer
 
 run:

README.md

@@ -18,6 +18,8 @@ and `nwggrid`.
 
 [more screenshots](https://scrot.cloud/album/nwg-drawer.Bogd) | [see on YouTube](https://youtu.be/iIgxJQhCQf0)
 
+[![Packaging status](https://repology.org/badge/vertical-allrepos/nwg-drawer.svg)](https://repology.org/project/nwg-drawer/versions)
+
 ## Installation
 
 ### Dependencies
@@ -62,7 +64,7 @@ Usage of nwg-drawer:
   -lang string
     	force lang, e.g. "en", "pl"
   -o string
-    	name of the Output to display the menu on (sway only)
+    	name of the Output to display the drawer on (sway only)
   -ovl
     	use OVerLay layer
   -s string

drawer.css

@@ -3,11 +3,12 @@ window {
     color: #eeeeee
 }
 
+/* search entry */
 entry {
     background-color: rgba (0, 0, 0, 0.2)
 }
 
-button {
+button, image {
     background: none;
     border: none
 }
@@ -16,6 +17,11 @@ button:hover {
     background-color: rgba (255, 255, 255, 0.1)
 }
 
+/* in case you wanted to give category buttons a different look */
+#category-button {
+    margin: 0 10px 0 10px
+}
+
 #pinned-box {
     padding-bottom: 5px;
     border-bottom: 1px dotted gray

go.mod

@@ -1,4 +1,4 @@
-module github.com/nwg-piotr/nwg-menu
+module github.com/nwg-piotr/nwg-drawer
 
 go 1.16
 

main.go

@@ -19,7 +19,7 @@ import (
 	"github.com/gotk3/gotk3/gtk"
 )
 
-const version = "0.1.0"
+const version = "0.1.4"
 
 var (
 	appDirs         []string
@@ -98,7 +98,7 @@ var (
 
 // Flags
 var cssFileName = flag.String("s", "drawer.css", "Styling: css file name")
-var targetOutput = flag.String("o", "", "name of the Output to display the menu on (sway only)")
+var targetOutput = flag.String("o", "", "name of the Output to display the drawer on (sway only)")
 var displayVersion = flag.Bool("v", false, "display Version information")
 var overlay = flag.Bool("ovl", false, "use OVerLay layer")
 var iconSize = flag.Int("is", 64, "Icon Size")
@@ -172,6 +172,7 @@ func main() {
 	if err != nil {
 		pinned = nil
 	}
+	println(fmt.Sprintf("Found %v pinned items", len(pinned)))
 
 	cssFile := filepath.Join(configDirectory, *cssFileName)
 
@@ -204,6 +205,7 @@ func main() {
 		log.Fatal("Unable to create window:", err)
 	}
 
+	if wayland() {
 		layershell.InitForWindow(win)
 
 		var output2mon map[string]*gdk.Monitor
@@ -232,6 +234,7 @@ func main() {
 		}
 
 		layershell.SetKeyboardMode(win, layershell.LAYER_SHELL_KEYBOARD_MODE_EXCLUSIVE)
+	}
 
 	win.Connect("destroy", func() {
 		gtk.MainQuit()
@@ -274,6 +277,17 @@ func main() {
 		cancelClose()
 	})
 
+	/*
+		In case someone REALLY needed to use X11 - for some stupid Zoom meeting or something, this allows
+		the drawer to behave properly on Openbox, and possibly somewhere else. For sure not on i3.
+		This feature is not really supported and will stay undocumented.
+	*/
+	if !wayland() {
+		println("Not Wayland, oh really?")
+		win.SetDecorated(false)
+		win.Maximize()
+	}
+
 	// Set up UI
 	outerVBox, _ := gtk.BoxNew(gtk.ORIENTATION_VERTICAL, 0)
 	win.Add(outerVBox)

tools.go

@@ -20,6 +20,10 @@ import (
 	"github.com/joshuarubin/go-sway"
 )
 
+func wayland() bool {
+	return os.Getenv("WAYLAND_DISPLAY") != "" || os.Getenv("XDG_SESSION_TYPE") == "wayland"
+}
+
 /*
 Window leave-notify-event event quits the program with glib Timeout 500 ms.
 We might have left the window by accident, so let's clear the timeout if window re-entered.
@@ -264,7 +268,7 @@ func listDesktopFiles() []string {
 }
 
 func setUpCategories() {
-	path := filepath.Join(getDataHome(), "nwg-menu/desktop-directories")
+	path := filepath.Join(getDataHome(), "nwg-drawer/desktop-directories")
 	var other category
 
 	for _, cName := range categoryNames {

uicomponents.go

@@ -17,7 +17,7 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 	flowBox, _ := gtk.FlowBoxNew()
 	if uint(len(pinned)) >= *columnsNumber {
 		flowBox.SetMaxChildrenPerLine(*columnsNumber)
-	} else {
+	} else if len(pinned) > 0 {
 		flowBox.SetMaxChildrenPerLine(uint(len(pinned)))
 	}
 
@@ -78,16 +78,17 @@ func setUpPinnedFlowBox() *gtk.FlowBox {
 			})
 			flowBox.Add(btn)
 		}
+		pinnedFlowBoxWrapper.PackStart(flowBox, true, false, 0)
+
+		//While moving focus with arrow keys we want buttons to get focus directly
+		flowBox.GetChildren().Foreach(func(item interface{}) {
+			item.(*gtk.Widget).SetCanFocus(false)
+		})
 	}
 	flowBox.Connect("enter-notify-event", func() {
 		cancelClose()
 	})
 
-	pinnedFlowBoxWrapper.PackStart(flowBox, true, false, 0)
-	//While moving focus with arrow keys we want buttons to get focus directly
-	flowBox.GetChildren().Foreach(func(item interface{}) {
-		item.(*gtk.Widget).SetCanFocus(false)
-	})
 	flowBox.ShowAll()
 
 	return flowBox
@@ -113,6 +114,7 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
 	hBox, _ := gtk.BoxNew(gtk.ORIENTATION_HORIZONTAL, 0)
 	eventBox.Add(hBox)
 	button, _ := gtk.ButtonNewWithLabel("All")
+	button.SetProperty("name", "category-button")
 	button.Connect("clicked", func(item *gtk.Button) {
 		searchEntry.SetText("")
 		appFlowBox = setUpAppsFlowBox(nil, "")
@@ -126,6 +128,7 @@ func setUpCategoriesButtonBox() *gtk.EventBox {
 	for _, cat := range categories {
 		if isSupposedToShowUp(cat.Name) {
 			button, _ = gtk.ButtonNewFromIconName(cat.Icon, gtk.ICON_SIZE_MENU)
+			button.SetProperty("name", "category-button")
 			catButtons = append(catButtons, button)
 			button.SetLabel(cat.DisplayName)
 			hBox.PackStart(button, false, false, 0)