debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sure minimized tabs show up in Tab Panel

Browse source
This commit is contained in:
Christian Dywan 2010-12-11 20:31:18 +01:00
parent e0c5bbedb3
commit 54971fd8ae
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
extensions/tab-panel.c
View file

@ -279,6 +279,20 @@ tab_panel_settings_notify_cb (MidoriWebSettings* settings,
gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 2, buttons, -1); gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 2, buttons, -1);
} }
static void
tab_panel_toggle_toolbook (GtkWidget* toolbar)
{
/* Hack to ensure correct toolbar visibility */
GtkWidget* toolbook = gtk_widget_get_parent (toolbar);
if (gtk_notebook_get_current_page (GTK_NOTEBOOK (toolbook))
== gtk_notebook_page_num (GTK_NOTEBOOK (toolbook), toolbar))
{
GList* items = gtk_container_get_children (GTK_CONTAINER (toolbar));
sokoke_widget_set_visible (toolbook, items != NULL);
g_list_free (items);
}
}
static void static void
tab_panel_remove_view (MidoriBrowser* browser, tab_panel_remove_view (MidoriBrowser* browser,
GtkWidget* view, GtkWidget* view,
@ -287,7 +301,9 @@ tab_panel_remove_view (MidoriBrowser* browser,
if (minimized) if (minimized)
{ {
GtkToolItem* toolitem = tab_panel_get_toolitem_for_view (view); GtkToolItem* toolitem = tab_panel_get_toolitem_for_view (view);
GtkWidget* toolbar = tab_panel_get_toolbar_for_browser (browser);
gtk_widget_destroy (GTK_WIDGET (toolitem)); gtk_widget_destroy (GTK_WIDGET (toolitem));
tab_panel_toggle_toolbook (toolbar);
} }
else else
{ {
@ -413,6 +429,7 @@ tab_panel_browser_add_tab_cb (MidoriBrowser* browser,
g_object_set_data (G_OBJECT (view), "tab-panel-ext-toolitem", toolitem); g_object_set_data (G_OBJECT (view), "tab-panel-ext-toolitem", toolitem);
gtk_widget_show (GTK_WIDGET (toolitem)); gtk_widget_show (GTK_WIDGET (toolitem));
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1); gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
tab_panel_toggle_toolbook (toolbar);
g_signal_connect (toolitem, "clicked", g_signal_connect (toolitem, "clicked",
G_CALLBACK (tab_panel_toolitem_clicked_cb), view); G_CALLBACK (tab_panel_toolitem_clicked_cb), view);
g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), "button-press-event", g_signal_connect (gtk_bin_get_child (GTK_BIN (toolitem)), "button-press-event",
@ -608,6 +625,7 @@ extension_init (void)
{ {
{ STOCK_TAB_PANEL, N_("T_ab Panel"), 0, 0, NULL }, { STOCK_TAB_PANEL, N_("T_ab Panel"), 0, 0, NULL },
}; };
MidoriExtension* extension;
factory = gtk_icon_factory_new (); factory = gtk_icon_factory_new ();
gtk_stock_add (items, G_N_ELEMENTS (items)); gtk_stock_add (items, G_N_ELEMENTS (items));
@ -621,7 +639,7 @@ extension_init (void)
gtk_icon_factory_add_default (factory); gtk_icon_factory_add_default (factory);
g_object_unref (factory); g_object_unref (factory);
MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION, extension = g_object_new (MIDORI_TYPE_EXTENSION,
"name", _("Tab Panel"), "name", _("Tab Panel"),
"description", _("Show tabs in a vertical panel"), "description", _("Show tabs in a vertical panel"),
"version", "0.1", "version", "0.1",

4
midori/midori-panel.c
View file

@ -404,7 +404,6 @@ midori_panel_init (MidoriPanel* panel)
gtk_notebook_set_show_border (GTK_NOTEBOOK (panel->toolbook), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (panel->toolbook), FALSE);
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->toolbook), FALSE); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->toolbook), FALSE);
gtk_box_pack_start (GTK_BOX (vbox), panel->toolbook, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), panel->toolbook, FALSE, FALSE, 0);
gtk_widget_show (panel->toolbook);
/* Create the notebook */ /* Create the notebook */
panel->notebook = gtk_notebook_new (); panel->notebook = gtk_notebook_new ();
@ -870,8 +869,7 @@ midori_panel_set_current_page (MidoriPanel* panel,
gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->toolbook), n);
toolbar = gtk_notebook_get_nth_page (GTK_NOTEBOOK (panel->toolbook), n); toolbar = gtk_notebook_get_nth_page (GTK_NOTEBOOK (panel->toolbook), n);
items = gtk_container_get_children (GTK_CONTAINER (toolbar)); items = gtk_container_get_children (GTK_CONTAINER (toolbar));
sokoke_widget_set_visible (panel->toolbook, sokoke_widget_set_visible (panel->toolbook, items != NULL);
g_list_nth_data (items, 1) != NULL);
g_list_free (items); g_list_free (items);
gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n); gtk_notebook_set_current_page (GTK_NOTEBOOK (panel->notebook), n);
label = midori_viewable_get_label (MIDORI_VIEWABLE (viewable)); label = midori_viewable_get_label (MIDORI_VIEWABLE (viewable));