Improve folder menu position

ErikKalkoken · Jan 23, 2025 · fabd464 · fabd464
1 parent ff1984a
commit fabd464
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/internal/app/ui/mobile/mobile.go b/internal/app/ui/mobile/mobile.go
@@ -43,12 +43,7 @@ func NewMobileUI(fyneApp fyne.App) *MobileUI {
 				items = append(items, it)
 			}
 		}
-		widget.ShowPopUpMenuAtRelativePosition(
-			fyne.NewMenu("", items...),
-			fyne.CurrentApp().Driver().CanvasForObject(o),
-			fyne.Position{},
-			o,
-		)
+		ShowContextMenu(o, fyne.NewMenu("", items...))
 	}
 
 	newCharacterAppBar := func(title string, body fyne.CanvasObject, items ...widget.ToolbarItem) *AppBar {
@@ -115,7 +110,7 @@ func NewMobileUI(fyneApp fyne.App) *MobileUI {
 			func() {
 				u.NotificationsArea.OnSelectNotification = func() {
 					characterNav.Push(
-						newCharacterAppBar("", u.NotificationsArea.Detail),
+						NewAppBar("", u.NotificationsArea.Detail),
 					)
 				}
 				characterNav.Push(

diff --git a/internal/app/ui/mobile/toolbaraction.go b/internal/app/ui/mobile/toolbaraction.go
@@ -10,12 +10,15 @@ func NewToolbarActionMenu(icon fyne.Resource, menu *fyne.Menu) *widget.ToolbarAc
 	a := widget.NewToolbarAction(icon, nil)
 	o := a.ToolbarObject()
 	a.OnActivated = func() {
-		widget.ShowPopUpMenuAtRelativePosition(
-			menu,
-			fyne.CurrentApp().Driver().CanvasForObject(o),
-			fyne.Position{},
-			o,
-		)
+		ShowContextMenu(o, menu)
 	}
 	return a
 }
+
+func ShowContextMenu(o fyne.CanvasObject, menu *fyne.Menu) {
+	m := widget.NewPopUpMenu(menu, fyne.CurrentApp().Driver().CanvasForObject(o))
+	m.ShowAtRelativePosition(fyne.NewPos(
+		-m.Size().Width+o.Size().Width,
+		o.Size().Height,
+	), o)
+}
diff --git a/internal/app/ui/notifications.go b/internal/app/ui/notifications.go
@@ -138,12 +138,13 @@ func (a *NotificationsArea) makeNotificationList() *widget.List {
 	l.OnSelected = func(id widget.ListItemID) {
 		a.clearDetail()
 		if id >= len(a.notifications) {
-			defer l.UnselectAll()
+			l.UnselectAll()
 			return
 		}
 		a.setDetail(a.notifications[id])
 		if a.OnSelectNotification != nil {
 			a.OnSelectNotification()
+			l.UnselectAll()
 		}
 	}
 	return l