[Panel-devel] KDE/kdebase/workspace/libs/plasma/widgets

[Matias Valdenegro Toro]

SVN commit 693115 by mvaldenegro:

Devirtualize minimumSize() and maximumSize() and add values to d-pointer.
Added setters.

CCMAIL:panel-devel at kde.org



 M  +15 -3     widget.cpp  
 M  +13 -3     widget.h  


--- trunk/KDE/kdebase/workspace/libs/plasma/widgets/widget.cpp #693114:693115
@@ -39,6 +39,8 @@
         ~Private() { }
 
         QSizeF size;
+        QSizeF minimumSize;
+        QSizeF maximumSize;
 
         Widget *parent;
         Layout *layout;
@@ -69,16 +71,26 @@
     return 0;
 }
 
-QSizeF Widget::maximumSize() const
+void Widget::setMinimumSize(const QSizeF& size)
 {
-    return QSizeF();
+    d->minimumSize = size;
 }
 
 QSizeF Widget::minimumSize() const
 {
-    return QSizeF(0.0, 0.0);
+    return d->minimumSize;
 }
 
+void Widget::setMaximumSize(const QSizeF& size)
+{
+    d->maximumSize = size;
+}
+
+QSizeF Widget::maximumSize() const
+{
+    return d->maximumSize;
+}
+
 bool Widget::hasHeightForWidth() const
 {
     return false;
--- trunk/KDE/kdebase/workspace/libs/plasma/widgets/widget.h #693114:693115
@@ -65,14 +65,24 @@
         virtual Qt::Orientations expandingDirections() const;
 
         /**
-         * Returns the minimum size of this Widget and it's contents.
+         * Sets the minimum size of this Widget.
          */
-        virtual QSizeF minimumSize() const;
+        void setMinimumSize(const QSizeF& size);
 
         /**
+         * Returns the minimum size of this Widget.
+         */
+        QSizeF minimumSize() const;
+
+        /**
+         * Sets the maximum size of this Widget.
+         */
+        void setMaximumSize(const QSizeF& size);
+
+        /**
          * Returns the maximum size of this Widget.
          */
-        virtual QSizeF maximumSize() const;
+        QSizeF maximumSize() const;
 
         /**
          * Returns true whatever this Widget can use height-for-width layout management,