applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

display: Only show monitor labels when display applet has focus

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=589562
This commit is contained in:
Robert Ancell 2011-05-02 15:59:50 +10:00
parent f13bae02b8
commit 201714d99a
1 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
panels/display/xrandr-capplet.c
View file

@ -171,6 +171,10 @@ on_screen_changed (GnomeRRScreen *scr,
} }
app->labeler = gnome_rr_labeler_new (app->current_configuration); app->labeler = gnome_rr_labeler_new (app->current_configuration);
if (gtk_widget_has_focus (app->panel))
gnome_rr_labeler_show (app->labeler);
else
gnome_rr_labeler_hide (app->labeler);
select_current_output_from_dialog_position (app); select_current_output_from_dialog_position (app);
} }
@ -2373,6 +2377,26 @@ get_output_for_window (GnomeRRConfig *configuration, GdkWindow *window)
win_rect.y + win_rect.height / 2); win_rect.y + win_rect.height / 2);
} }
static gboolean
dialog_focus_in_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
{
App *app = data;
if (app->labeler)
gnome_rr_labeler_show (app->labeler);
return FALSE;
}
static gboolean
dialog_focus_out_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
{
App *app = data;
if (app->labeler)
gnome_rr_labeler_hide (app->labeler);
return FALSE;
}
static void static void
on_toplevel_realized (GtkWidget *widget, on_toplevel_realized (GtkWidget *widget,
App *app) App *app)
@ -2476,6 +2500,10 @@ run_application (void)
app->clock_settings = g_settings_new (CLOCK_SCHEMA); app->clock_settings = g_settings_new (CLOCK_SCHEMA);
app->panel = _gtk_builder_get_widget (builder, "display-panel"); app->panel = _gtk_builder_get_widget (builder, "display-panel");
g_signal_connect (app->panel, "focus-in-event",
G_CALLBACK (dialog_focus_in_cb), app);
g_signal_connect (app->panel, "focus-out-event",
G_CALLBACK (dialog_focus_out_cb), app);
if (!app->panel) if (!app->panel)
g_warning ("Missing display-panel object"); g_warning ("Missing display-panel object");