DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let the fullscreen toolbar button reflect the current state

Browse Source
This commit is contained in:
Pierre Pronchery 2012-06-26 22:18:16 +00:00
parent eace2f90ea
commit 2df7374d05
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/helper.c
View File

@ -56,6 +56,7 @@ struct _Surfer
GtkWidget * window; GtkWidget * window;
GtkWidget * menubar; GtkWidget * menubar;
GtkWidget * view; GtkWidget * view;
GtkToolItem * tb_fullscreen;
GtkWidget * ab_window; GtkWidget * ab_window;
}; };
@ -74,7 +75,7 @@ static int _helper_open_devel(Helper * helper, char const * package);
static int _usage(void); static int _usage(void);
/* callbacks */ /* callbacks */
static gboolean _helper_on_close(gpointer data); static void _helper_on_close(gpointer data);
static gboolean _helper_on_closex(gpointer data); static gboolean _helper_on_closex(gpointer data);
#ifndef EMBEDDED #ifndef EMBEDDED
static void _helper_on_file_close(gpointer data); static void _helper_on_file_close(gpointer data);
@ -160,7 +161,6 @@ static Helper * _helper_new(void)
Helper * helper; Helper * helper;
GtkAccelGroup * group; GtkAccelGroup * group;
GtkWidget * vbox; GtkWidget * vbox;
GtkToolItem * toolitem;
GtkWidget * widget; GtkWidget * widget;
if((helper = object_new(sizeof(*helper))) == NULL) if((helper = object_new(sizeof(*helper))) == NULL)
@ -194,13 +194,15 @@ static Helper * _helper_new(void)
gtk_toolbar_insert(GTK_TOOLBAR(widget), toolitem, -1); gtk_toolbar_insert(GTK_TOOLBAR(widget), toolitem, -1);
#endif #endif
#if GTK_CHECK_VERSION(2, 8, 0) #if GTK_CHECK_VERSION(2, 8, 0)
toolitem = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_FULLSCREEN); helper->tb_fullscreen = gtk_toggle_tool_button_new_from_stock(
GTK_STOCK_FULLSCREEN);
#else #else
toolitem = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_ZOOM_FIT); helper->tb_fullscreen = gtk_toggle_tool_button_new_from_stock(
GTK_STOCK_ZOOM_FIT);
#endif #endif
g_signal_connect_swapped(toolitem, "toggled", G_CALLBACK( g_signal_connect_swapped(helper->tb_fullscreen, "toggled", G_CALLBACK(
_helper_on_fullscreen), helper); _helper_on_fullscreen), helper);
gtk_toolbar_insert(GTK_TOOLBAR(widget), toolitem, -1); gtk_toolbar_insert(GTK_TOOLBAR(widget), helper->tb_fullscreen, -1);
gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), widget, FALSE, TRUE, 0);
/* view */ /* view */
helper->view = ghtml_new(helper); helper->view = ghtml_new(helper);
@ -332,7 +334,7 @@ static int _helper_open_man(Helper * helper, int section, char const * page)
/* callbacks */ /* callbacks */
/* helper_on_close */ /* helper_on_close */
static gboolean _helper_on_close(gpointer data) static void _helper_on_close(gpointer data)
{ {
Helper * helper = data; Helper * helper = data;
@ -494,6 +496,8 @@ void surfer_set_fullscreen(Surfer * surfer, gboolean fullscreen)
{ {
Helper * helper = surfer; Helper * helper = surfer;
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
helper->tb_fullscreen), fullscreen);
if(fullscreen) if(fullscreen)
{ {
gtk_widget_hide(helper->menubar); gtk_widget_hide(helper->menubar);