Skip to content

Commit fc13fa0

Browse files
authored
Merge branch 'main' into leolost/interactive-screenshot-shortcut
2 parents 9769de1 + 37e8c4d commit fc13fa0

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

data/gala.gschema.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</description>
6363
</key>
6464
<key type="s" name="panel-main-menu-action">
65-
<default>''</default>
65+
<default>'io.elementary.wingpanel --toggle-indicator=app-launcher'</default>
6666
<summary>Panel main menu action</summary>
6767
<description>Sets the command to run when the panel-main-menu keybinding is pressed.</description>
6868
</key>
@@ -72,7 +72,7 @@
7272
<description></description>
7373
</key>
7474
<key type="s" name="overlay-action">
75-
<default>''</default>
75+
<default>'io.elementary.wingpanel --toggle-indicator=app-launcher'</default>
7676
<summary></summary>
7777
<description></description>
7878
</key>

src/ShellClients/HideTracker.vala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,13 +213,10 @@ public class Gala.HideTracker : Object {
213213
}
214214

215215
private void toggle_display (bool should_hide) {
216-
unowned var window_actor = (Meta.WindowActor) panel.window.get_compositor_private ();
217-
218-
// Window actor receives pointer events while hidden on X11: https://github.com/elementary/gala/issues/2083
219216
#if HAS_MUTTER45
220-
hovered = panel.window.has_pointer () && window_actor.visible;
217+
hovered = panel.window.has_pointer ();
221218
#else
222-
hovered = window_has_pointer () && window_actor.visible;
219+
hovered = window_has_pointer ();
223220
#endif
224221

225222
if (should_hide && !hovered && !panel.window.has_focus ()) {

src/WindowManager.vala

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -411,10 +411,12 @@ namespace Gala {
411411
private void launch_action (string action_key) {
412412
try {
413413
var action = behavior_settings.get_string (action_key);
414-
if (action != null && action != "") {
414+
if (action != null) {
415415
Process.spawn_command_line_async (action);
416416
}
417-
} catch (Error e) { warning (e.message); }
417+
} catch (Error e) {
418+
warning (e.message);
419+
}
418420
}
419421

420422
private void on_monitors_changed () {
@@ -1049,13 +1051,7 @@ namespace Gala {
10491051
current.@delete (Gtk.get_current_event_time ());
10501052
break;
10511053
case ActionType.OPEN_LAUNCHER:
1052-
try {
1053-
Process.spawn_command_line_async (
1054-
behavior_settings.get_string ("panel-main-menu-action")
1055-
);
1056-
} catch (Error e) {
1057-
warning (e.message);
1058-
}
1054+
launch_action ("panel-main-menu-action");
10591055
break;
10601056
case ActionType.WINDOW_OVERVIEW:
10611057
if (window_overview == null) {

0 commit comments

Comments
 (0)