From kde-commits  Sun Apr 13 17:06:58 2008
From: Thomas Georgiou <tageorgiou () gmail ! com>
Date: Sun, 13 Apr 2008 17:06:58 +0000
To: kde-commits
Subject: extragear/plasma/applets/frame
Message-Id: <1208106418.146593.14666.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=120810644405198

SVN commit 796490 by tgeorgiou:

Hello frame!


 M  +4 -4      frame.cpp  


--- trunk/extragear/plasma/applets/frame/frame.cpp #796489:796490
@@ -124,7 +124,7 @@
 QSizeF Frame::contentSizeHint() const {
     if (!m_picture.isNull()) {
         QSizeF sizeHint;
-        qreal maxSize = contentSize().width() > contentSize().height() ? contentSize().width() : contentSize().height();
+        qreal maxSize = geometry().width() > geometry().height() ? geometry().width() : geometry().height();
         if (m_picture.width() > m_picture.height()) {
             sizeHint = QSizeF( maxSize, (maxSize / m_picture.width()) * m_picture.height() );
         } else {
@@ -132,7 +132,7 @@
         }
         return sizeHint;
     } else {
-        return contentSize();
+        return geometry().size();
     }
 }
 
@@ -325,9 +325,9 @@
                            const QRect &rect)
 {
     if (m_pixmapCache.isNull() ||
-        contentRect().toRect().size() != m_pixmapCache.size()) {
+        geometry().toRect().size() != m_pixmapCache.size()) {
         updateGeometry();
-        paintCache(option, contentRect().toRect().size());
+        paintCache(option, geometry().toRect().size());
     }
 
     p->drawPixmap(rect, m_pixmapCache, rect);