colin/sublime-music
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug where popups closed on a click inside the popup

Browse Source
This commit is contained in:
Sumner Evans
2019-12-28 18:48:59 -07:00
parent 3293eb8e64
commit e88cb5781d
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
sublime/ui/main.py
View File

@@ -175,14 +175,25 @@ class MainWindow(Gtk.ApplicationWindow):
# Event Listeners # Event Listeners
# ========================================================================= # =========================================================================
def on_button_release(self, win, event): def on_button_release(self, win, event):
if not self.event_in_widget(event, self.search_entry): if not self.event_in_widgets(
event,
self.search_entry,
self.search_popup,
):
self.search_popup.popdown() self.search_popup.popdown()
if not self.event_in_widget(event, self.player_controls.device_button): if not self.event_in_widgets(
event,
self.player_controls.device_button,
self.player_controls.device_popover,
):
self.player_controls.device_popover.popdown() self.player_controls.device_popover.popdown()
if not self.event_in_widget(event, if not self.event_in_widgets(
self.player_controls.play_queue_button): event,
self.player_controls.play_queue_button,
self.player_controls.play_queue_popover,
):
self.player_controls.play_queue_popover.popdown() self.player_controls.play_queue_popover.popdown()
def on_menu_clicked(self, button): def on_menu_clicked(self, button):
@@ -203,14 +214,21 @@ class MainWindow(Gtk.ApplicationWindow):
# Helper Functions # Helper Functions
# ========================================================================= # =========================================================================
def event_in_widget(self, event, widget): def event_in_widgets(self, event, *widgets):
_, win_x, win_y = Gdk.Window.get_origin(self.get_window()) for widget in widgets:
widget_x, widget_y = widget.translate_coordinates(self, 0, 0) if not widget.is_visible():
allocation = widget.get_allocation() continue
bound_x = (win_x + widget_x, win_x + widget_x + allocation.width) _, win_x, win_y = Gdk.Window.get_origin(self.get_window())
bound_y = (win_y + widget_y, win_y + widget_y + allocation.height) widget_x, widget_y = widget.translate_coordinates(self, 0, 0)
allocation = widget.get_allocation()
return ( bound_x = (win_x + widget_x, win_x + widget_x + allocation.width)
(bound_x[0] <= event.x_root <= bound_x[1]) bound_y = (win_y + widget_y, win_y + widget_y + allocation.height)
and (bound_y[0] <= event.y_root <= bound_y[1]))
# If the event is in this widget, return True immediately.
if ((bound_x[0] <= event.x_root <= bound_x[1])
and (bound_y[0] <= event.y_root <= bound_y[1])):
return True
return False