Merge lp:~muesli4-2/midori/panel-resizing into lp:midori

[Moritz Bruder]

I changed the way the side panel and the *vpaned* (containing the webview) are added to and contained within the *hpaned*. In particular, I changed the "shrink" property to allow the side panel to shrink further.

I added an option within the preferences, which is disabled by default but stored within the settings once enabled! (I hope I didn't forget anything, but works flawless on my machine.)

Especially on netbooks with small screen this is absolutely necessary, when using vertical tabs.

[Moritz Bruder (muesli4-2)]

I found out that the "last-panel-position" property, which was already in the code, is not saved for the next session.

This leads sometimes to unpredictable positions. I guess it would be best to install the property in the MidoriWebSettings class. I could do this, but I would like to hear your thoughts on the issue.

[Paweł Forysiuk (tuxator)]

Any particular scenario for notebook case? For example what size browser should be there?

[Moritz Bruder (muesli4-2)]

> Any particular scenario for notebook case? For example what size browser
> should be there?

My netbook has a resolution of 1024x600, the vertical side panel in its minimal width takes almost 1/3 of the screen. Furthermore I don't see any reason to limit it.

[gue5t gue5t (gue5t)]

Allowing to shrink the sidepanel for small screens seems completely reasonable.

I think the preference for whether to allow shrinking or not is probably unnecessary. Unchecking the checkbox doesn't seem to help users with small screens (who need it checked) nor users with large screens (who will simply not shrink the sidepanel so much). Or am I missing something?

The last-panel-position thing can probably be addressed in a separate branch or on top of this one.

review: Needs Information

Unmerged revisions

7072. By Moritz Bruder on 2015-12-12

Added flexible resizing support for the side panel (with an opt-in setting, default is still the same).

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2015-11-30 23:44:52 +0000
+++ midori/midori-browser.c	2015-12-12 23:05:31 +0000
@@ -5041,6 +5041,7 @@
                                       MidoriBrowser* browser)
 {
     gboolean right_aligned = katze_object_get_boolean (panel, "right-aligned");
+    gboolean panel_resizing = katze_object_get_boolean (browser->settings, "panel-resizing");
     GtkWidget* hpaned = gtk_widget_get_parent (browser->panel);
     GtkWidget* vpaned = gtk_widget_get_parent (browser->notebook);
     gint paned_position = gtk_paned_get_position (GTK_PANED (hpaned));
@@ -5058,13 +5059,13 @@
     gtk_container_remove (GTK_CONTAINER (hpaned), vpaned);
     if (right_aligned)
     {
-        gtk_paned_pack1 (GTK_PANED (hpaned), vpaned, TRUE, FALSE);
-        gtk_paned_pack2 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE);
+        gtk_paned_pack1 (GTK_PANED (hpaned), vpaned, TRUE, panel_resizing);
+        gtk_paned_pack2 (GTK_PANED (hpaned), browser->panel, FALSE, panel_resizing);
     }
     else
     {
-        gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE);
-        gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE);
+        gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, panel_resizing);
+        gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, panel_resizing);
     }
     gtk_paned_set_position (GTK_PANED (hpaned), paned_size - paned_position);
     g_object_unref (browser->panel);
@@ -6241,11 +6242,13 @@
         "signal::close",
         midori_panel_close_cb, browser,
         NULL);
-    gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, FALSE);
+
+    gboolean panel_resizing = katze_object_get_boolean (browser->settings, "panel-resizing");
+    gtk_paned_pack1 (GTK_PANED (hpaned), browser->panel, FALSE, panel_resizing);
 
     /* Notebook, containing all views */
     vpaned = gtk_vpaned_new ();
-    gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE);
+    gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, panel_resizing);
     gtk_widget_show (vpaned);
     browser->notebook = midori_notebook_new ();
 
@@ -6449,6 +6452,21 @@
 }
 
 static void
+midori_browser_set_panel_resizing (MidoriBrowser* browser,
+                                   gboolean       panel_resizing)
+{
+    GtkWidget* hpaned = gtk_widget_get_parent (browser->panel);
+    GtkWidget* vpaned = gtk_widget_get_parent (browser->notebook);
+    GValue panel_resizing_value = G_VALUE_INIT;
+    g_value_init (&panel_resizing_value, G_TYPE_BOOLEAN);
+    g_value_set_boolean (&panel_resizing_value, panel_resizing);
+
+    /* Change shrink properties of children to allow more flexible resizing. */
+    gtk_container_child_set_property (GTK_CONTAINER (hpaned), browser->panel, "shrink", &panel_resizing_value);
+    gtk_container_child_set_property (GTK_CONTAINER (hpaned), vpaned, "shrink", &panel_resizing_value);
+}
+
+static void
 _midori_browser_update_settings (MidoriBrowser* browser)
 {
     gboolean remember_last_window_size;
@@ -6460,6 +6478,7 @@
     gboolean show_menubar, show_bookmarkbar;
     gboolean show_panel;
     MidoriToolbarStyle toolbar_style;
+    gboolean panel_resizing;
     gchar* toolbar_items;
     gboolean close_buttons_left, close_buttons_on_tabs;
 
@@ -6481,6 +6500,7 @@
                   "show-statusbar", &browser->show_statusbar,
                   "toolbar-style", &toolbar_style,
                   "toolbar-items", &toolbar_items,
+                  "panel-resizing", &panel_resizing,
                   "close-buttons-left", &close_buttons_left,
                   "close-buttons-on-tabs", &close_buttons_on_tabs,
                   "maximum-history-age", &browser->maximum_history_age,
@@ -6563,6 +6583,8 @@
     _action_set_active (browser, "Statusbar", browser->show_statusbar);
 
     g_free (toolbar_items);
+
+    midori_browser_set_panel_resizing (browser, panel_resizing);
 }
 
 static void
@@ -6579,6 +6601,8 @@
 
     if (name == g_intern_string ("toolbar-style"))
         _midori_browser_set_toolbar_style (browser, g_value_get_enum (&value));
+    else if (name == g_intern_string ("panel-resizing"))
+        midori_browser_set_panel_resizing (browser, g_value_get_boolean (&value));
     else if (name == g_intern_string ("toolbar-items"))
         midori_window_set_actions (MIDORI_WINDOW (browser), g_value_get_string (&value));
     else if (name == g_intern_string ("compact-sidepanel"))

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2015-07-06 21:26:46 +0000
+++ midori/midori-preferences.c	2015-12-12 23:05:31 +0000
@@ -478,6 +478,9 @@
     button = katze_property_proxy (settings, "open-tabs-in-the-background", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Open tabs in the background"));
     SPANNED_ADD (button);
+    button = katze_property_proxy (settings, "panel-resizing", NULL);
+    gtk_button_set_label (GTK_BUTTON (button), _("Allow arbitrary sidepanel resizing"));
+    INDENTED_ADD (button);
 
     /* Page "Network" */
     PAGE_NEW (GTK_STOCK_NETWORK, _("Network"));

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2015-11-22 19:28:16 +0000
+++ midori/midori-websettings.c	2015-12-12 23:05:31 +0000
@@ -48,6 +48,7 @@
     MidoriSettings parent_instance;
 
     MidoriToolbarStyle toolbar_style : 3;
+    gboolean panel_resizing;
     MidoriStartup load_on_startup : 2;
     MidoriNewTabType new_tab_type: 3;
     MidoriPreferredEncoding preferred_encoding : 3;
@@ -83,6 +84,7 @@
     PROP_0,
 
     PROP_TOOLBAR_STYLE,
+    PROP_PANEL_RESIZING,
 
     PROP_LOAD_ON_STARTUP,
     PROP_NEW_TAB,
@@ -321,6 +323,15 @@
                                      flags));
 
     g_object_class_install_property (gobject_class,
+                                     PROP_PANEL_RESIZING,
+                                     g_param_spec_boolean (
+                                     "panel-resizing",
+                                     "Allow arbitrary sidepanel resizing",
+                                     "Whether the sidepanel can be shrinked further",
+                                     FALSE,
+                                     flags));
+
+    g_object_class_install_property (gobject_class,
                                      PROP_LOAD_ON_STARTUP,
                                      g_param_spec_enum (
                                      "load-on-startup",
@@ -998,6 +1009,9 @@
         web_settings->toolbar_style = g_value_get_enum (value);
         break;
 
+    case PROP_PANEL_RESIZING:
+        web_settings->panel_resizing = g_value_get_boolean (value);
+        break;
     case PROP_LOAD_ON_STARTUP:
         web_settings->load_on_startup = g_value_get_enum (value);
         break;
@@ -1159,6 +1173,10 @@
         g_value_set_enum (value, web_settings->toolbar_style);
         break;
 
+    case PROP_PANEL_RESIZING:
+        g_value_set_boolean (value, web_settings->panel_resizing);
+        break;
+
     case PROP_LOAD_ON_STARTUP:
         g_value_set_enum (value, web_settings->load_on_startup);
         break;