[Xfce4-commits] <xfce4-panel:andrzejr/deskbar2> Launcher plugin: small=FALSE in deskbar mode with label visible.

[Andrzej]

Updating branch refs/heads/andrzejr/deskbar2
         to 13cfa4cc7b5612af43f7a8eb2d2bcb8c60c5f9d3 (commit)
       from a7c42bbab812edf1c3df3e9fe7a62c3a8ef393f4 (commit)

commit 13cfa4cc7b5612af43f7a8eb2d2bcb8c60c5f9d3
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Mon Feb 6 11:57:04 2012 +0900

    Launcher plugin: small=FALSE in deskbar mode with label visible.
    
    Regression fix. This error has been triggered by commit:
    f362692 panel-itembar: Removed item size checks.
    
    This commit should be harmless. It can be used without commit f362692
    and may speed up itembar layout a bit.

 plugins/launcher/launcher.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index d68d21a..8af2ff5 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -1713,6 +1713,14 @@ launcher_plugin_button_update (LauncherPlugin *plugin)
     {
       panel_return_if_fail (GTK_IS_LABEL (plugin->child));
       mode = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
+
+      /* disable the "small" property in the deskbar mode and the label visible */
+      if (mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR &&
+          plugin->show_label)
+        xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), FALSE);
+      else
+        xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), TRUE);
+
       gtk_label_set_angle (GTK_LABEL (plugin->child),
                            (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? 270 : 0);
       gtk_label_set_text (GTK_LABEL (plugin->child),