[Xfce4-commits] <xfce4-panel:andrzejr/deskbar-github> Fixed a horizontal mode bug introduced in the previous commit.

[Andrzej]

Updating branch refs/heads/andrzejr/deskbar-github
         to 7ab23914572c96a79303928e1ed89d64d3288a4c (commit)
       from 719594570381f2bc6ad91f8616b80af7db91b2ec (commit)

commit 7ab23914572c96a79303928e1ed89d64d3288a4c
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Thu Nov 10 20:08:47 2011 +0900

    Fixed a horizontal mode bug introduced in the previous commit.

 plugins/tasklist/tasklist-widget.c |   28 ++++++++++------------------
 1 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index 8044d77..dd678c8 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -817,24 +817,16 @@ xfce_tasklist_size_request (GtkWidget      *widget,
     }
 
   /* set the requested sizes */
-  if (xfce_tasklist_horizontal (tasklist))
-    {
-      if (tasklist->deskbar_mode)
-        {
-          requisition->height = child_height * n_windows;
-          requisition->width = tasklist->size;
-        }
-      else
-        {
-          requisition->width = length;
-          requisition->height = tasklist->size;
-        }
-    }
-  else
-    {
-      requisition->width = tasklist->size;
-      requisition->height = length;
-    }
+  if (tasklist->horizontal) {
+    requisition->width = length;
+    requisition->height = tasklist->size;
+  } else if (tasklist->deskbar_mode) {
+    requisition->height = child_height * n_windows;
+    requisition->width = tasklist->size;
+  } else {
+    requisition->width = tasklist->size;
+    requisition->height = length;
+  }
 }