Skip to content

Commit 1ab85a0

Browse files
authored
Merge branch 'main' into leolost/session-start-smooth
2 parents 3adb9aa + bb56870 commit 1ab85a0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

plugins/pip/PopupWindow.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
118118

119119
window_actor.notify["allocation"].connect (on_allocation_changed);
120120
container.set_position (container_margin, container_margin);
121-
update_clone_clip ();
121+
on_allocation_changed ();
122122

123123
unowned var window = window_actor.get_meta_window ();
124124
window.unmanaged.connect (on_close_click_clicked);

src/ShellClients/PanelWindow.vala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
114114
public void set_size (int width, int height) {
115115
this.width = width;
116116
this.height = height;
117+
position_window ();
117118
}
118119

119120
public void request_visible_in_multitasking_view () {
@@ -160,7 +161,7 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
160161
var overlap = false;
161162
var focus_overlap = false;
162163
var focus_maximized_overlap = false;
163-
var fullscreen_overlap = false;
164+
var focus_fullscreen_overlap = false;
164165

165166
Meta.Window? normal_mru_window, any_mru_window;
166167
normal_mru_window = InternalUtils.get_mru_window (workspace, out any_mru_window);
@@ -185,22 +186,21 @@ public class Gala.PanelWindow : ShellWindow, RootTarget {
185186

186187
overlap = true;
187188

188-
fullscreen_overlap = fullscreen_overlap || window.fullscreen;
189-
190189
if (window != normal_mru_window && window != any_mru_window) {
191190
continue;
192191
}
193192

194193
focus_overlap = true;
195194
focus_maximized_overlap = window.maximized_vertically;
195+
focus_fullscreen_overlap = window.fullscreen;
196196
}
197197

198198
switch (hide_mode) {
199199
case MAXIMIZED_FOCUS_WINDOW: return focus_maximized_overlap;
200200
case OVERLAPPING_FOCUS_WINDOW: return focus_overlap;
201201
case OVERLAPPING_WINDOW: return overlap;
202202
case ALWAYS: return true;
203-
case NEVER: return fullscreen_overlap;
203+
case NEVER: return focus_fullscreen_overlap;
204204
}
205205

206206
return false;

0 commit comments

Comments
 (0)