[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/pager
From:       Marco Martin <notmart () gmail ! com>
Date:       2009-06-21 20:02:14
Message-ID: 1245614534.051246.12967.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 984961 by mart:

in vertical panels show really the number of columns instead of rows,
lies--
CCBUG:197257


 M  +12 -3     pager.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/pager/pager.cpp #984960:984961
@@ -224,8 +224,10 @@
     ui.showWindowIconsCheckBox->setChecked(m_showWindowIcons);
     if (formFactor() == Plasma::Vertical) {
         ui.labelRows->setText(i18n("Number of columns:"));
+        ui.spinRows->setValue(m_columns);
+    } else {
+        ui.spinRows->setValue(m_rows);
     }
-    ui.spinRows->setValue(m_rows);
     ui.spinRows->setMaximum(m_desktopCount);
 
     switch (m_currentDesktopSelected){
@@ -476,9 +478,16 @@
     // we need to keep all pager applets consistent since this affects
     // the layout of the desktops as used by the window manager,
     // so we store the row count in the applet global configuration
-    if (m_rows != ui.spinRows->value()) {
+    int rows = 0;
+    if (formFactor() == Plasma::Vertical) {
+        rows = m_desktopCount / ui.spinRows->value() + m_desktopCount % ui.spinRows->value();
+    } else {
+        rows = ui.spinRows->value();
+    }
+kWarning()<<"AAAAAAAAA"<<rows;
+    if (m_rows != rows) {
         KConfigGroup globalcg = globalConfig();
-        m_rows = ui.spinRows->value();
+        m_rows = rows;
         if (m_rows > m_desktopCount) {
             m_rows = m_desktopCount;
         }
[prev in list] [next in list] [prev in thread] [next in thread]