dbus-menu 0.1.1.1 → 0.1.2.0

raw patch · 3 files changed

+32/−16 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• ChangeLog.md +10/−0
• dbus-menu.cabal +1/−1
• src/DBusMenu.hs +21/−15

@@ -1,5 +1,15 @@ # Changelog for dbus-menu +## 0.1.2.0++* Fix submenu clicks being silently dropped: run `AboutToShow` and `GetLayout`+  DBus calls on a forked thread instead of blocking the GTK main loop. Widget+  updates are posted back via `idleAdd` at `PRIORITY_DEFAULT_IDLE` so pending+  click events are processed first.+* Remove redundant `onMenuItemActivate` refresh trigger on parent items (the+  `onWidgetShow` handler on the submenu is sufficient and avoids a double+  rebuild that created additional windows for lost clicks).+ ## 0.1.1.1  * Fix "menu already attached" GTK warning by removing redundant

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           dbus-menu-version:        0.1.1.1+version:        0.1.2.0 synopsis:       A Haskell implementation of the DBusMenu protocol description:    Haskell client for the com.canonical.dbusmenu DBus interface, providing GTK3 menu construction from DBusMenu services. category:       System

@@ -38,6 +38,7 @@ import DBus import DBus.Client import Data.GI.Base (unsafeCastTo)+import qualified GI.GLib as GLib import qualified GI.Gtk as Gtk import System.Log.Logger (Priority(..), logM) import Text.Printf@@ -280,23 +281,28 @@       -- the service doesn't support/require lazy updates.       populateGtkMenu client dest path submenu node       loadedRef <- newIORef (not (null (lnChildren node)))-      let refresh =-            catchAny-              (do -- Allow the service to update the submenu content lazily.-                  needUpdate <- aboutToShow client dest path (lnId node)-                  loaded <- readIORef loadedRef-                  when (needUpdate || not loaded) $ do-                    (_, layout) <- getLayout client dest path (lnId node) 1 layoutPropNames+      let refresh = void $ forkIO $ catchAny+            (do -- Run DBus calls on a forked thread to avoid blocking the GTK+                -- main loop (which would cause queued click events to be lost+                -- when populateGtkMenu rebuilds menu items).+                needUpdate <- aboutToShow client dest path (lnId node)+                loaded <- readIORef loadedRef+                when (needUpdate || not loaded) $ do+                  (_, layout) <- getLayout client dest path (lnId node) 1 layoutPropNames+                  -- Post GTK updates back on the main thread.  Using+                  -- PRIORITY_DEFAULT_IDLE ensures pending input events (clicks)+                  -- are processed first.+                  void $ GLib.idleAdd GLib.PRIORITY_DEFAULT_IDLE $ do                     populateGtkMenu client dest path submenu layout                     writeIORef loadedRef True-                  Gtk.widgetShowAll submenu)-              (\e -> dbusMenuLogger WARNING $-                     printf "Submenu %d refresh failed (stale ID?): %s"-                            (lnId node) (show e))-      _ <- Gtk.onWidgetShow submenu refresh-      -- Gtk.Menu show semantics can vary; also refresh when the parent item is-      -- activated (e.g. click/keyboard open).-      _ <- Gtk.onMenuItemActivate item refresh+                    Gtk.widgetShowAll submenu+                    return False)+            (\e -> dbusMenuLogger WARNING $+                   printf "Submenu %d refresh failed (stale ID?): %s"+                          (lnId node) (show e))+      _ <- Gtk.onWidgetShow submenu $ do+        refresh+        Gtk.widgetShowAll submenu       Gtk.menuItemSetSubmenu item (Just submenu)    pure item