[Xfce4-commits] <ristretto:stephan/icon-bar> Add a size submenu to the icon-bar, make scrollbar always visible.

[Stephan Arts]

Updating branch refs/heads/stephan/icon-bar
         to 2e654d073c6361e4cb822c823a29fd562b354db8 (commit)
       from 19fa2e41b0f734bbc988d3073606c2e32e0614c1 (commit)

commit 2e654d073c6361e4cb822c823a29fd562b354db8
Author: Stephan Arts <stephan at xfce.org>
Date:   Thu Feb 2 19:27:40 2012 +0100

    Add a size submenu to the icon-bar, make scrollbar always visible.
    
     - Workaround to a resizing issue with the icon-bar+table.

 src/main_window.c      |   11 ++++++-----
 src/main_window_ui.xml |    9 +++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main_window.c b/src/main_window.c
index 3edc39a..e672fc8 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -374,6 +374,7 @@ static GtkActionEntry action_entries[] =
                 G_CALLBACK (cb_rstto_main_window_about), },
 /* Position Menu */
   { "position-menu", NULL, N_ ("_Position"), NULL, },
+  { "size-menu", NULL, N_ ("_Size"), NULL, },
   { "thumbnailbar-position-menu", NULL, N_ ("Thumbnail Bar _Position"), NULL, },
   { "thumbnailbar-size-menu", NULL, N_ ("Thumbnail _Size"), NULL, },
 /* Misc */
@@ -651,7 +652,7 @@ rstto_main_window_init (RsttoMainWindow *window)
     g_signal_connect(G_OBJECT(window->priv->thumbnailbar), "selection-changed", G_CALLBACK(cb_icon_bar_selection_changed), window);
 
     window->priv->t_bar_s_window = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
     gtk_container_add (GTK_CONTAINER (window->priv->t_bar_s_window), window->priv->thumbnailbar);
 
     exo_icon_bar_set_text_column (EXO_ICON_BAR (window->priv->thumbnailbar), 0);
@@ -1833,7 +1834,7 @@ rstto_main_window_set_navigationbar_position (RsttoMainWindow *window, guint ori
                     0,
                     0);
 
-            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
             gtk_scrolled_window_set_placement (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_CORNER_BOTTOM_RIGHT);
 
             gtk_container_remove (GTK_CONTAINER (window->priv->table), window->priv->image_list_toolbar);
@@ -1872,7 +1873,7 @@ rstto_main_window_set_navigationbar_position (RsttoMainWindow *window, guint ori
                     0,
                     0);
 
-            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
             gtk_scrolled_window_set_placement (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_CORNER_BOTTOM_LEFT);
 
             gtk_container_remove (GTK_CONTAINER (window->priv->table), window->priv->image_list_toolbar);
@@ -1911,7 +1912,7 @@ rstto_main_window_set_navigationbar_position (RsttoMainWindow *window, guint ori
                     0,
                     0);
 
-            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
             gtk_scrolled_window_set_placement (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_CORNER_BOTTOM_RIGHT);
 
             gtk_container_remove (GTK_CONTAINER (window->priv->table), window->priv->image_list_toolbar);
@@ -1949,7 +1950,7 @@ rstto_main_window_set_navigationbar_position (RsttoMainWindow *window, guint ori
                     0,
                     0);
 
-            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+            gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_POLICY_ALWAYS, GTK_POLICY_NEVER);
             gtk_scrolled_window_set_placement (GTK_SCROLLED_WINDOW (window->priv->t_bar_s_window), GTK_CORNER_TOP_RIGHT);
 
             gtk_container_remove (GTK_CONTAINER (window->priv->table), window->priv->image_list_toolbar);
diff --git a/src/main_window_ui.xml b/src/main_window_ui.xml
index b0c9509..2521d54 100644
--- a/src/main_window_ui.xml
+++ b/src/main_window_ui.xml
@@ -93,6 +93,15 @@
             <menuitem action="pos-top"/>
             <menuitem action="pos-bottom"/>
         </menu>
+        <menu action="size-menu">
+            <menuitem action="size-very-small"/>
+            <menuitem action="size-smaller"/>
+            <menuitem action="size-small"/>
+            <menuitem action="size-normal"/>
+            <menuitem action="size-large"/>
+            <menuitem action="size-larger"/>
+            <menuitem action="size-very-large"/>
+        </menu>
     </popup>
 
     <popup name="image-viewer-menu">