From: Christian Dywan Date: Mon, 5 Mar 2012 21:21:33 +0000 (+0100) Subject: midori_browser_notebook_resize must consider n = 7 X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf07220bc34cdf1620ef1b7b5aa07cbd6645ccb5;p=midori midori_browser_notebook_resize must consider n = 7 --- diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3daa6bb2..b4fbd3cc 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -1521,20 +1521,18 @@ midori_browser_notebook_resize (MidoriBrowser* browser, GdkRectangle* allocation) { gint new_size = 0; - gint n = gtk_notebook_get_n_pages (GTK_NOTEBOOK(browser->notebook)); + gint n = MAX (1, gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook))); const gint max_size = 150; gint min_size; gint icon_size = 16; GtkAllocation notebook_size; GList* children; - g_return_if_fail (n > 0); - if (allocation != NULL) notebook_size.width = allocation->width; else gtk_widget_get_allocation (browser->notebook, ¬ebook_size); - new_size = notebook_size.width / n - 7; + new_size = notebook_size.width / n; gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (browser->notebook), GTK_ICON_SIZE_MENU, &icon_size, NULL);