Fixed desktop switching with "Show empty desktops minimized" option.issue/10

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/src/komposelayout.h b/src/komposelayout.h
index 4ab1df0..19c45d1 100644
--- a/src/komposelayout.h
+++ b/src/komposelayout.h
@@ -35,10 +35,12 @@ enum LayoutDirections { DLAYOUT_LEFT, DLAYOUT_RIGHT, DLAYOUT_TOP, DLAYOUT_BOTTOM
 
 enum WrapDirections { WLAYOUT_NONE, WLAYOUT_HORIZONTAL, WLAYOUT_VERTICAL, WLAYOUT_BOTH };
 
+enum ContainerType { CONTAINER_GENERIC, CONTAINER_FILLED, CONTAINER_EMPTY };
+
 /**
 The main layout class.
 TQLayout just didn't fit :(
- 
+
 @author Hans Oischinger
 */
 class KomposeLayout : public TQObject
@@ -52,7 +54,7 @@ public:
   void add( KomposeWidget *w );
   void remove( KomposeWidget *w );
   void setType( int t );
-int getType() { return layoutType; }
+  int getType() { return layoutType; }
 
   const TQPtrList<KomposeWidget> *getManagedWidgets() { return &list; }
   int getNumofChilds() { return list.count(); }
@@ -65,15 +67,16 @@ public slots:
 
 protected:
   KomposeWidget* getNeighbour( TQPtrList<KomposeWidget> listToSearch,
+                               int listType,
                                const KomposeWidget* widget,
                                int direction = DLAYOUT_RIGHT,
                                int wrap = WLAYOUT_NONE );
   void rearrangeContents();
   void rearrangeContents( const TQRect& availRect,
                           const TQPtrList<KomposeWidget> widgets,
+                          int containerType = CONTAINER_GENERIC,
                           int rows = -1,
-                          int columns = -1,
-                          bool setMemberRowsCols = true );
+                          int columns = -1 );
 
 private:
   // List of all managed childs
@@ -86,8 +89,10 @@ private:
   int layoutType;
   int spacing;
   bool widgetsChanged;
-  int currentRows;
-  int currentColumns;
+
+  int filledRows;
+  int filledColumns;
+  int emptyColumns;
 
   KomposeWidget* parentWidget;
 };