From 109225081a58ad2b51255d549d11933b1a752b2c Mon Sep 17 00:00:00 2001 From: trigg Date: Thu, 23 Jun 2022 19:02:30 +0100 Subject: [PATCH] - Keep monitor selector for floating type - Force monitor draggable window selection --- discover_overlay/draggable_window_wayland.py | 5 +++-- discover_overlay/settings.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/discover_overlay/draggable_window_wayland.py b/discover_overlay/draggable_window_wayland.py index 9a5c026..b430f30 100644 --- a/discover_overlay/draggable_window_wayland.py +++ b/discover_overlay/draggable_window_wayland.py @@ -27,7 +27,7 @@ except (ImportError, ValueError): class DraggableWindowWayland(Gtk.Window): """A Wayland full-screen window which can be moved and resized""" - def __init__(self, pos_x=0, pos_y=0, width=300, height=300, message="Message", settings=None, steamos=False): + def __init__(self, pos_x=0, pos_y=0, width=300, height=300, message="Message", settings=None, steamos=False, monitor=None): Gtk.Window.__init__(self, type=Gtk.WindowType.TOPLEVEL) self.pos_x = pos_x self.pos_y = pos_y @@ -43,13 +43,14 @@ class DraggableWindowWayland(Gtk.Window): self.connect('button-release-event', self.button_release) self.set_app_paintable(True) - self.monitor = 0 self.drag_type = None self.drag_x = 0 self.drag_y = 0 if GtkLayerShell: GtkLayerShell.init_for_window(self) + if monitor: + GtkLayerShell.set_monitor(self,monitor) GtkLayerShell.set_layer(self, GtkLayerShell.Layer.TOP) GtkLayerShell.set_anchor(self, GtkLayerShell.Edge.LEFT, True) GtkLayerShell.set_anchor(self, GtkLayerShell.Edge.RIGHT, True) diff --git a/discover_overlay/settings.py b/discover_overlay/settings.py index 03c424c..0d68a1a 100644 --- a/discover_overlay/settings.py +++ b/discover_overlay/settings.py @@ -161,7 +161,8 @@ class SettingsWindow(Gtk.VBox): pos_x=self.floating_x, pos_y=self.floating_y, width=self.floating_w, height=self.floating_h, message=_("Place & resize this window then press Green!"), settings=self, - steamos=self.discover.steamos) + steamos=self.discover.steamos, + monitor=self.get_monitor_obj(self.monitor)) else: self.placement_window = DraggableWindow( pos_x=self.floating_x, pos_y=self.floating_y, @@ -197,7 +198,6 @@ class SettingsWindow(Gtk.VBox): self.save_config() self.align_x_widget.hide() self.align_y_widget.hide() - self.align_monitor_widget.hide() self.align_placement_widget.show() def change_monitor(self, button):