[Xfce4-commits] <xfce4-panel:nick/gtk3> Launcher: more layout fixes (with arrow button on).

[Andrzej]

Updating branch refs/heads/nick/gtk3
         to 971713b1852a0a0ff007e45bdf54707980e5c7f3 (commit)
       from 197a1314279c79886d9d8887e8e673afbf5f45b0 (commit)

commit 971713b1852a0a0ff007e45bdf54707980e5c7f3
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Wed Apr 17 21:12:09 2013 +0100

    Launcher: more layout fixes (with arrow button on).

 plugins/launcher/launcher.c |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 7f7e627..5ff670a 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -1258,14 +1258,13 @@ launcher_plugin_size_changed (XfcePanelPlugin *panel_plugin,
 {
   LauncherPlugin    *plugin = XFCE_LAUNCHER_PLUGIN (panel_plugin);
   gint               p_width, p_height;
-  gint               a_width, a_height;
+  gint               a_size;
   gboolean           horizontal;
   LauncherArrowType  arrow_position;
 
   /* initialize the plugin size */
   size /= xfce_panel_plugin_get_nrows (panel_plugin);
   p_width = p_height = size;
-  a_width = a_height = -1;
 
   /* add the arrow size */
   if (gtk_widget_get_visible (plugin->arrow))
@@ -1281,20 +1280,20 @@ launcher_plugin_size_changed (XfcePanelPlugin *panel_plugin,
         {
         case LAUNCHER_ARROW_NORTH:
         case LAUNCHER_ARROW_SOUTH:
-          a_height = ARROW_BUTTON_SIZE;
-          if (horizontal)
-            p_width -= ARROW_BUTTON_SIZE;
-          else
-            p_height += ARROW_BUTTON_SIZE;
+          if (!horizontal)
+            {
+              gtk_widget_get_preferred_height (plugin->arrow, NULL, &a_size);
+              p_height += a_size;
+            }
           break;
 
         case LAUNCHER_ARROW_EAST:
         case LAUNCHER_ARROW_WEST:
-          a_width = ARROW_BUTTON_SIZE;
           if (horizontal)
-            p_width += ARROW_BUTTON_SIZE;
-          else
-            p_height -= ARROW_BUTTON_SIZE;
+            {
+              gtk_widget_get_preferred_width (plugin->arrow, NULL, &a_size);
+              p_width += a_size;
+            }
           break;
 
         default:
@@ -1302,9 +1301,6 @@ launcher_plugin_size_changed (XfcePanelPlugin *panel_plugin,
           panel_assert_not_reached ();
           break;
         }
-
-      /* set the arrow size */
-      gtk_widget_set_size_request (plugin->arrow, a_width, a_height);
     }
 
   /* set the panel plugin size */