From ce57df5bd0fba5615a1b87ffe6d391b44725a641 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Thu, 8 Apr 2010 18:47:51 +0000
Subject: Remove min status bar width limitation. Set initial status bar width
 when gui_window is created. Note the TODOs in gtk_window.c
 gui_create_browser_window().

svn path=/trunk/netsurf/; revision=10323
---
 gtk/gtk_window.c      | 12 ++++++++++++
 gtk/res/netsurf.glade |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'gtk')

diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c
index 063925eb7..1dfb8d5c6 100644
--- a/gtk/gtk_window.c
+++ b/gtk/gtk_window.c
@@ -194,6 +194,18 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 		g->layout = GTK_LAYOUT(glade_xml_get_widget(xml, "layout"));
 		g->status_bar = GTK_LABEL(glade_xml_get_widget(xml, "status_bar"));
 
+		/* Set statusbar / scrollbar proportion according to the
+                 * percentage given by "option_toolbar_status_width / 10000" */
+		/* TODO: Is this the best place to do this? */
+		/* TODO: Should set it to a proportion of real window width,
+		 *       not some arbitrary guess at window width. */
+		/* TODO: Needs to be reset to proportion of window width as
+		 *       window is resized too */
+		const int window_width_guess = 1024;
+		GtkPaned *paned = GTK_PANED(glade_xml_get_widget(xml, "hpaned1"));
+		gtk_paned_set_position (paned, (option_toolbar_status_width *
+				window_width_guess) / 10000);
+
 		/* connect the scrollbars to the layout widget */
 		gtk_layout_set_hadjustment(g->layout,
 				gtk_range_get_adjustment(GTK_RANGE(
diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade
index 8f3f8dcf7..270ac215d 100644
--- a/gtk/res/netsurf.glade
+++ b/gtk/res/netsurf.glade
@@ -420,7 +420,7 @@
             <property name="can_focus">True</property>
             <child>
               <widget class="GtkLabel" id="status_bar">
-                <property name="width_request">400</property>
+                <property name="width_request">1</property>
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="xpad">4</property>
-- 
cgit v1.2.3