fix tray (#329)

.config/ags/modules/bar/normal/spaceright.js

@@ -48,41 +48,44 @@ export default () => {
                 children: [
                     Widget.Box({ hexpand: true, }),
                     barTray,
-                    separatorDot,
+                    Widget.EventBox({
-                    barStatusIcons,
+                        onScrollUp: () => {
+                            if (!Audio.speaker) return;
+                            if (Audio.speaker.volume <= 0.09) Audio.speaker.volume += 0.01;
+                            else Audio.speaker.volume += 0.03;
+                            Indicator.popup(1);
+                        },
+                        onScrollDown: () => {
+                            if (!Audio.speaker) return;
+                            if (Audio.speaker.volume <= 0.09) Audio.speaker.volume -= 0.01;
+                            else Audio.speaker.volume -= 0.03;
+                            Indicator.popup(1);
+                        },
+                        onHover: () => { barStatusIcons.toggleClassName('bar-statusicons-hover', true) },
+                        onHoverLost: () => { barStatusIcons.toggleClassName('bar-statusicons-hover', false) },
+                        onPrimaryClick: () => App.toggleWindow('sideright'),
+                        onSecondaryClick: () => execAsync(['bash', '-c', 'playerctl next || playerctl position `bc <<< "100 * $(playerctl metadata mpris:length) / 1000000 / 100"` &']).catch(print),
+                        onMiddleClick: () => execAsync('playerctl play-pause').catch(print),
+                        setup: (self) => self.on('button-press-event', (self, event) => {
+                            if (event.get_button()[1] === 8)
+                                execAsync('playerctl previous').catch(print)
+                        }),
+                        child: Widget.Box({
+                            children: [
+                                separatorDot,
+                                barStatusIcons,
+                            ],
+                        }),
+                    }),
                 ],
             }),
         ]
     });
 
-    return Widget.EventBox({
+    return Widget.Box({
-        onScrollUp: () => {
+        children: [
-            if (!Audio.speaker) return;
+            actualContent,
-            if (Audio.speaker.volume <= 0.09) Audio.speaker.volume += 0.01;
+            Widget.Box({ className: 'bar-corner-spacing' }),
-            else Audio.speaker.volume += 0.03;
+        ]
-            Indicator.popup(1);
-        },
-        onScrollDown: () => {
-            if (!Audio.speaker) return;
-            if (Audio.speaker.volume <= 0.09) Audio.speaker.volume -= 0.01;
-            else Audio.speaker.volume -= 0.03;
-            Indicator.popup(1);
-        },
-        onHover: () => { barStatusIcons.toggleClassName('bar-statusicons-hover', true) },
-        onHoverLost: () => { barStatusIcons.toggleClassName('bar-statusicons-hover', false) },
-        onPrimaryClick: () => App.toggleWindow('sideright'),
-        onSecondaryClick: () => execAsync(['bash', '-c', 'playerctl next || playerctl position `bc <<< "100 * $(playerctl metadata mpris:length) / 1000000 / 100"` &']).catch(print),
-        onMiddleClick: () => execAsync('playerctl play-pause').catch(print),
-        setup: (self) => self.on('button-press-event', (self, event) => {
-            if (event.get_button()[1] === 8)
-                execAsync('playerctl previous').catch(print)
-        }),
-        child: Widget.Box({
-            homogeneous: false,
-            children: [
-                actualContent,
-                Widget.Box({ className: 'bar-corner-spacing' }),
-            ]
-        })
     });
 }

.config/ags/modules/bar/normal/tray.js

@@ -13,8 +13,8 @@ const SysTrayItem = (item) => Button({
     setup: (self) => self
         .hook(item, (self) => self.tooltipMarkup = item['tooltip-markup'])
     ,
-    onClicked: btn => item.menu.popup_at_widget(btn, Gravity.SOUTH, Gravity.NORTH, null),
+    onPrimaryClick: (_, event) => item.activate(event),
-    onSecondaryClick: btn => item.menu.popup_at_widget(btn, Gravity.SOUTH, Gravity.NORTH, null),
+    onSecondaryClick: (btn, event) => item.menu.popup_at_widget(btn, Gravity.SOUTH, Gravity.NORTH, null),
 });
 
 export const Tray = (props = {}) => {