Skip to content

Commit ffad6f6

Browse files
committed
Merge branch 'main' into leolost/desktop-workspace-switcher
2 parents 795998a + eca9b14 commit ffad6f6

File tree

7 files changed

+452
-35
lines changed

7 files changed

+452
-35
lines changed

po/hu.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: noise\n"
99
"Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
1010
"POT-Creation-Date: 2024-12-18 21:23+0000\n"
11-
"PO-Revision-Date: 2024-12-08 11:16+0000\n"
11+
"PO-Revision-Date: 2025-01-16 17:55+0000\n"
1212
"Last-Translator: TomiOhl <[email protected]>\n"
1313
"Language-Team: Hungarian <https://l10n.elementary.io/projects/desktop/gala/"
1414
"hu/>\n"
@@ -17,7 +17,7 @@ msgstr ""
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20-
"X-Generator: Weblate 5.8.4\n"
20+
"X-Generator: Weblate 5.9.2\n"
2121
"X-Launchpad-Export-Date: 2017-02-21 05:47+0000\n"
2222

2323
#: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -128,17 +128,17 @@ msgstr "Frissített fordítások"
128128

129129
#: data/gala.metainfo.xml.in:35
130130
msgid "Fixed rare crash when a dock window was killed"
131-
msgstr ""
131+
msgstr "Ritka összeomlás javítva dokk ablak leállításakor"
132132

133133
#: data/gala.metainfo.xml.in:36
134134
msgid "Added interactive screenshot shortcut"
135-
msgstr ""
135+
msgstr "Gyorsparancs interaktív képernyőképhez"
136136

137137
#: data/gala.metainfo.xml.in:37
138-
#, fuzzy
139-
#| msgid "Fix potential crash when taking screenshots"
140138
msgid "Fixed crash when using tiling shortcuts"
141-
msgstr "Esetleges összeomlás javítva képernyőkép készítésekor"
139+
msgstr ""
140+
"Összeomlás javítva ablakok felosztásával kapcsolatos gyorsparancsok "
141+
"használatakor"
142142

143143
#: data/gala.metainfo.xml.in:56
144144
msgid "Improved shadows performance"

src/InternalUtils.vala

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,5 +388,15 @@ namespace Gala {
388388
Clutter.get_default_backend ().get_default_seat ().bell_notify ();
389389
#endif
390390
}
391+
392+
public static void update_transients_visible (Meta.Window window, bool visible) {
393+
window.foreach_transient ((transient) => {
394+
unowned var actor = (Meta.WindowActor) transient.get_compositor_private ();
395+
396+
actor.visible = visible;
397+
398+
return true;
399+
});
400+
}
391401
}
392402
}

src/ShellClients/HideTracker.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public class Gala.HideTracker : Object {
152152
});
153153
}
154154

155-
private void update_overlap () {
155+
public void update_overlap () {
156156
overlap = false;
157157
focus_overlap = false;
158158
focus_maximized_overlap = false;

src/ShellClients/PanelClone.vala

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public class Gala.PanelClone : Object {
5555
}
5656
});
5757

58+
wm.get_display ().in_fullscreen_changed.connect (check_hide);
59+
5860
Idle.add_once (() => {
5961
if (hide_mode == NEVER) {
6062
show ();
@@ -89,22 +91,38 @@ public class Gala.PanelClone : Object {
8991
return;
9092
}
9193

92-
new GesturePropertyTransition (actor, default_gesture_tracker, "translation-y", null, calculate_translation_y (true)).start (false);
94+
InternalUtils.update_transients_visible (panel.window, false);
95+
96+
new GesturePropertyTransition (
97+
actor, default_gesture_tracker, "translation-y", null, calculate_translation_y (true)
98+
).start (false, () => InternalUtils.update_transients_visible (panel.window, !panel_hidden));
9399

94100
default_gesture_tracker.add_success_callback (false, () => panel_hidden = true);
95101
}
96102

97103
private void show () {
98-
if (!panel_hidden || default_gesture_tracker.recognizing) {
104+
if (!panel_hidden || default_gesture_tracker.recognizing || wm.get_display ().get_monitor_in_fullscreen (panel.window.get_monitor ())) {
99105
return;
100106
}
101107

102108
if (!Meta.Util.is_wayland_compositor ()) {
103109
Utils.x11_unset_window_pass_through (panel.window);
104110
}
105111

106-
new GesturePropertyTransition (actor, default_gesture_tracker, "translation-y", null, calculate_translation_y (false)).start (false);
112+
new GesturePropertyTransition (
113+
actor, default_gesture_tracker, "translation-y", null, calculate_translation_y (false)
114+
).start (false, () => InternalUtils.update_transients_visible (panel.window, !panel_hidden));
107115

108116
default_gesture_tracker.add_success_callback (false, () => panel_hidden = false);
109117
}
118+
119+
private void check_hide () {
120+
if (wm.get_display ().get_monitor_in_fullscreen (panel.window.get_monitor ())) {
121+
hide ();
122+
} else if (hide_mode == NEVER) {
123+
show ();
124+
} else {
125+
hide_tracker.update_overlap ();
126+
}
127+
}
110128
}

src/ShellClients/ShellClientsManager.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public class Gala.ShellClientsManager : Object {
191191
}
192192

193193
private bool is_itself_positioned (Meta.Window window) {
194-
return (window in positioned_windows) || (window in panel_windows);
194+
return (window in positioned_windows) || (window in panel_windows) || NotificationStack.is_notification (window);
195195
}
196196

197197
public bool is_positioned_window (Meta.Window window) {

src/Widgets/MultitaskingView.vala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace Gala {
2828
private GestureTracker multitasking_gesture_tracker;
2929
private GestureTracker workspace_gesture_tracker;
3030

31-
public WindowManager wm { get; construct; }
31+
public WindowManagerGala wm { get; construct; }
3232

3333
private Meta.Display display;
3434
private ModalProxy modal_proxy;
@@ -53,7 +53,7 @@ namespace Gala {
5353
}
5454
}
5555

56-
public MultitaskingView (WindowManager wm) {
56+
public MultitaskingView (WindowManagerGala wm) {
5757
Object (wm: wm);
5858
}
5959

@@ -631,6 +631,7 @@ namespace Gala {
631631
wm.background_group.hide ();
632632
wm.window_group.hide ();
633633
wm.top_window_group.hide ();
634+
wm.shell_group.hide ();
634635
show ();
635636
grab_key_focus ();
636637

@@ -693,6 +694,7 @@ namespace Gala {
693694
wm.background_group.show ();
694695
wm.window_group.show ();
695696
wm.top_window_group.show ();
697+
wm.shell_group.show ();
696698

697699
dock_clones.destroy_all_children ();
698700

@@ -721,7 +723,7 @@ namespace Gala {
721723
foreach (unowned Meta.WindowActor actor in window_actors) {
722724
const int MAX_OFFSET = 200;
723725

724-
if (actor.is_destroyed () || !actor.visible) {
726+
if (actor.is_destroyed () || !actor.visible || actor.translation_y != 0) {
725727
continue;
726728
}
727729

0 commit comments

Comments
 (0)