This is an automated email from the git hooks/post-receive script. o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfce4-settings.
commit 01e12cd290cf71914ca3a5664114e4560469b8a7 Author: Simon Steinbeiss <[email protected]> Date: Sun Aug 26 15:56:24 2018 +0200 display: Drop the focus-events for the identity popups Before the identity popups would be hidden when the display settings dialog lost focus. This however breaks other focus features as it eats the focus-in and focus-out events. --- dialogs/display-settings/display-dialog.glade | 19 ++++++++++++++----- dialogs/display-settings/main.c | 18 ------------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index 7e600ea..12086d6 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -445,9 +445,6 @@ <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> <style> <class name="linked"/> </style> @@ -497,9 +494,8 @@ <property name="margin_left">12</property> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">5</property> - <property name="width">2</property> </packing> </child> <child> @@ -517,6 +513,19 @@ </packing> </child> <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="label" translatable="yes">Show popup windows to identify displays</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> <placeholder/> </child> <child> diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index 12979d9..452d6d4 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -1422,20 +1422,6 @@ set_display_popups_visible(gboolean visible) } } -static gboolean -focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data) -{ - set_display_popups_visible(FALSE); - return TRUE; -} - -static gboolean -focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data) -{ - set_display_popups_visible(TRUE && show_popups); - return TRUE; -} - static void on_identify_displays_toggled (GtkWidget *widget, GtkBuilder *builder) { @@ -3141,10 +3127,6 @@ display_settings_show_main_dialog (GdkDisplay *display) RRNotify + 1); gdk_window_add_filter (gdk_get_default_root_window (), screen_on_event, builder); - /* Show/Hide the helper popups when the dialog is shown/hidden - g_signal_connect(G_OBJECT(dialog), "focus-out-event", G_CALLBACK (focus_out_event), builder); - g_signal_connect(G_OBJECT(dialog), "focus-in-event", G_CALLBACK (focus_in_event), builder); */ - app = g_new0 (App, 1); initialize_connected_outputs(); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
