Code cleanup

This commit is contained in:
Pierre Pronchery 2013-11-05 01:08:42 +01:00
parent bbd821880f
commit be5699968b

View File

@ -470,24 +470,15 @@ int presenter_open_dialog(Presenter * presenter)
/* private */ /* private */
/* useful */ /* useful */
/* presenter_present */ /* presenter_present */
static void _present_window(Presenter * presenter);
static void _presenter_present(Presenter * presenter) static void _presenter_present(Presenter * presenter)
{ {
GdkScreen * screen; GdkScreen * screen;
GdkColor black;
GdkRectangle rect; GdkRectangle rect;
if(presenter->sl_window == NULL) if(presenter->sl_window == NULL)
{ _present_window(presenter);
presenter->sl_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_keep_above(GTK_WINDOW(presenter->sl_window),
TRUE);
memset(&black, 0, sizeof(black));
gtk_widget_modify_bg(presenter->sl_window, GTK_STATE_NORMAL,
&black);
g_signal_connect_swapped(presenter->sl_window, "delete-event",
G_CALLBACK(_presenter_on_slideshow_closex),
presenter);
}
/* (re-)configure the window */ /* (re-)configure the window */
screen = gdk_screen_get_default(); screen = gdk_screen_get_default();
gdk_screen_get_monitor_geometry(screen, 0, &rect); gdk_screen_get_monitor_geometry(screen, 0, &rect);
@ -498,6 +489,18 @@ static void _presenter_present(Presenter * presenter)
gtk_window_fullscreen(GTK_WINDOW(presenter->sl_window)); gtk_window_fullscreen(GTK_WINDOW(presenter->sl_window));
} }
static void _present_window(Presenter * presenter)
{
GdkColor black;
presenter->sl_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_keep_above(GTK_WINDOW(presenter->sl_window), TRUE);
memset(&black, 0, sizeof(black));
gtk_widget_modify_bg(presenter->sl_window, GTK_STATE_NORMAL, &black);
g_signal_connect_swapped(presenter->sl_window, "delete-event",
G_CALLBACK(_presenter_on_slideshow_closex), presenter);
}
/* callbacks */ /* callbacks */
/* presenter_on_about */ /* presenter_on_about */