HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve adding/removing of the special separator between menubar and toolbar when the toolbar is appended to the menubar.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4916 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2010-05-15 12:56:42 +00:00
parent d7020722d0
commit 3e78659f47
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -9,6 +9,9 @@
win32_show_document_open_dialog(). win32_show_document_open_dialog().
* src/dialogs.c: * src/dialogs.c:
Call handle_save_as() only when the Save As dialog was not cancelled. Call handle_save_as() only when the Save As dialog was not cancelled.
* src/toolbar.c:
Improve adding/removing of the special separator between menubar and
toolbar when the toolbar is appended to the menubar.
2010-05-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> 2010-05-15 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>

21
src/toolbar.c
View File

@ -409,17 +409,20 @@ void toolbar_update_ui(void)
{ {
static GtkWidget *hbox_menubar = NULL; static GtkWidget *hbox_menubar = NULL;
static GtkWidget *menubar = NULL; static GtkWidget *menubar = NULL;
static GtkWidget *menubar_toolbar_separator = NULL; GtkWidget *menubar_toolbar_separator = NULL;
GtkWidget *parent; GtkWidget *parent;
GtkToolItem *first_item;
if (menubar == NULL) if (menubar == NULL)
{ /* cache widget pointers */ { /* cache widget pointers */
hbox_menubar = ui_lookup_widget(main_widgets.window, "hbox_menubar"); hbox_menubar = ui_lookup_widget(main_widgets.window, "hbox_menubar");
menubar = ui_lookup_widget(main_widgets.window, "menubar1"); menubar = ui_lookup_widget(main_widgets.window, "menubar1");
}
menubar_toolbar_separator = GTK_WIDGET(gtk_separator_tool_item_new()); /* the separator between the menubar and the toolbar */
gtk_toolbar_insert(GTK_TOOLBAR(main_widgets.toolbar), first_item = gtk_toolbar_get_nth_item(GTK_TOOLBAR(main_widgets.toolbar), 0);
GTK_TOOL_ITEM(menubar_toolbar_separator), 0); if (first_item != NULL && GTK_IS_SEPARATOR_TOOL_ITEM(first_item))
{
gtk_widget_destroy(GTK_WIDGET(first_item));
} }
parent = gtk_widget_get_parent(main_widgets.toolbar); parent = gtk_widget_get_parent(main_widgets.toolbar);
@ -442,6 +445,12 @@ void toolbar_update_ui(void)
} }
else else
gtk_box_pack_start(GTK_BOX(hbox_menubar), main_widgets.toolbar, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox_menubar), main_widgets.toolbar, TRUE, TRUE, 0);
/* the separator between the menubar and the toolbar */
menubar_toolbar_separator = GTK_WIDGET(gtk_separator_tool_item_new());
gtk_widget_show(menubar_toolbar_separator);
gtk_toolbar_insert(GTK_TOOLBAR(main_widgets.toolbar),
GTK_TOOL_ITEM(menubar_toolbar_separator), 0);
} }
else else
{ {
@ -466,8 +475,6 @@ void toolbar_update_ui(void)
gtk_box_reorder_child(GTK_BOX(box), main_widgets.toolbar, 1); gtk_box_reorder_child(GTK_BOX(box), main_widgets.toolbar, 1);
} }
} }
/* the separator between the menubar and the toolbar */
ui_widget_show_hide(menubar_toolbar_separator, toolbar_prefs.append_to_menu);
/* we need to adjust the packing flags for the menubar to expand it if it is alone in the /* we need to adjust the packing flags for the menubar to expand it if it is alone in the
* hbox and not expand it if the toolbar is appended */ * hbox and not expand it if the toolbar is appended */
gtk_box_set_child_packing(GTK_BOX(hbox_menubar), menubar, gtk_box_set_child_packing(GTK_BOX(hbox_menubar), menubar,