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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/containments/panel
From:       Marco Martin <notmart () gmail ! com>
Date:       2009-08-25 13:47:05
Message-ID: 1251208025.774650.596.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1015419 by mart:

to disable the panel autoresize on theme margins change remove the
resize lines, not the dynamic margins calculation


 M  +16 -7     panel.cpp  


--- trunk/KDE/kdebase/workspace/plasma/containments/panel/panel.cpp #1015418:1015419
@@ -502,6 +502,22 @@
 
     //invalidate the layout and set again
     if (layout()) {
+        switch (location()) {
+        case LeftEdge:
+            rightWidth = qMin(rightWidth, qMax(qreal(1), size().width() - \
KIconLoader::SizeMedium)); +            break;
+        case RightEdge:
+            leftWidth = qMin(leftWidth, qMax(qreal(1), size().width() - \
KIconLoader::SizeMedium)); +            break;
+        case TopEdge:
+            bottomHeight = qMin(bottomHeight, qMax(qreal(1), size().height() - \
KIconLoader::SizeMedium)); +            break;  
+        case BottomEdge:
+            topHeight = qMin(topHeight, qMax(qreal(1), size().height() - \
KIconLoader::SizeMedium)); +            break;
+        default:
+            break;
+        }
         qreal oldLeft = leftWidth;
         qreal oldTop = topHeight;
         qreal oldRight = rightWidth;
@@ -512,13 +528,6 @@
         }
 
         layout()->setContentsMargins(leftWidth, topHeight, rightWidth, \
                bottomHeight);
-        if (formFactor() == Plasma::Vertical) {
-            setPreferredHeight(preferredHeight() - (oldBottom - bottomHeight));
-        } else if (QApplication::layoutDirection() == Qt::LeftToRight) {
-            setPreferredWidth(preferredWidth() - (oldRight - rightWidth));
-        } else {
-            setPreferredWidth(preferredWidth() - (oldLeft - leftWidth));
-        }
 
         layout()->invalidate();
         resize(preferredSize());


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