From 9738f074293d158f2e89b58206f561ae10540267 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 26 Oct 2011 19:40:14 +0200 Subject: [PATCH] Respect close button visibility for tab size And use the themed icon size. --- midori/midori-browser.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 1bf8bfc5..7f1eaecd 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1519,11 +1519,18 @@ _midori_browser_update_notebook (MidoriBrowser* browser) gint new_size = 0; gint n = gtk_notebook_get_n_pages (GTK_NOTEBOOK(browser->notebook)); const gint max_size = 150; - const gint min_size = 32; + gint min_size; + gint icon_size = 16; GtkAllocation notebook_size; gtk_widget_get_allocation (browser->notebook, ¬ebook_size); if (n > 0) new_size = notebook_size.width / n - 7; + + gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (browser->notebook), + GTK_ICON_SIZE_MENU, &icon_size, NULL); + min_size = icon_size; + if (katze_object_get_boolean (browser->settings, "close-buttons-on-tabs")) + min_size += icon_size; if (new_size < min_size) new_size = min_size; if (new_size > max_size) new_size = max_size; -- 2.39.5