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

List:       kde-commits
Subject:    [plasma-framework/mart/FrameSvgTransactions] src/plasma: make updateSizes work with masks too
From:       Marco Martin <null () kde ! org>
Date:       2017-02-01 8:47:58
Message-ID: E1cYqa6-0002Xk-7U () code ! kde ! org
[Download RAW message or body]

Git commit 05783dc69be1f4ba3598469ded375866eb15423b by Marco Martin.
Committed on 01/02/2017 at 08:47.
Pushed by mart into branch 'mart/FrameSvgTransactions'.

make updateSizes work with masks too

updateSizes no longer a private slot, that wasn't used anymore

Change-Id: Idfae9b623bce73bb1a3b21d1358742a4811cb02e

M  +6    -6    src/plasma/framesvg.cpp
M  +1    -1    src/plasma/framesvg.h
M  +1    -1    src/plasma/private/framesvg_p.h

https://commits.kde.org/plasma-framework/05783dc69be1f4ba3598469ded375866eb15423b

diff --git a/src/plasma/framesvg.cpp b/src/plasma/framesvg.cpp
index ca9de526a..15d67d31b 100644
--- a/src/plasma/framesvg.cpp
+++ b/src/plasma/framesvg.cpp
@@ -542,10 +542,10 @@ QPixmap FrameSvgPrivate::alphaMask()
             }
             maskFrame->enabledBorders = frame->enabledBorders;
 
-            updateSizes();
+            updateSizes(maskFrame);
         }
 
-        maskFrame = frame;
+       // maskFrame = frame;
         maskFrame->enabledBorders = frame->enabledBorders;
         if (maskFrame->cachedBackground.isNull() || maskFrame->frameSize != frameSize(frame)) {
             const QString oldKey = cacheId(maskFrame, prefix);
@@ -861,7 +861,7 @@ void FrameSvgPrivate::cacheFrame(const QString &prefixToSave, const QPixmap &bac
     }
 }
 
-void FrameSvgPrivate::updateSizes() const
+void FrameSvgPrivate::updateSizes(FrameData *frame) const
 {
     //qCDebug(LOG_PLASMA) << "!!!!!!!!!!!!!!!!!!!!!! updating sizes" << prefix;
     Q_ASSERT(frame);
@@ -967,19 +967,19 @@ void FrameSvgPrivate::updateNeeded()
 {
     q->setElementPrefix(requestedPrefix);
     q->clearCache();
-    updateSizes();
+    updateSizes(frame);
 }
 
 void FrameSvgPrivate::updateAndSignalSizes()
 {
-    updateSizes();
+    updateSizes(frame);
     emit q->repaintNeeded();
 }
 
 QSizeF FrameSvgPrivate::frameSize(FrameData *frame) const
 {
     if (!frame->frameSize.isValid()) {
-        updateSizes();
+        updateSizes(frame);
         frame->frameSize = q->size();
     }
 
diff --git a/src/plasma/framesvg.h b/src/plasma/framesvg.h
index c9c6ea3db..e113f6fef 100644
--- a/src/plasma/framesvg.h
+++ b/src/plasma/framesvg.h
@@ -298,7 +298,7 @@ private:
     FrameSvgPrivate *const d;
     friend class FrameData;
 
-    Q_PRIVATE_SLOT(d, void updateSizes())
+    //Q_PRIVATE_SLOT(d, void updateSizes())
     Q_PRIVATE_SLOT(d, void updateNeeded())
 };
 
diff --git a/src/plasma/private/framesvg_p.h b/src/plasma/private/framesvg_p.h
index 78300c55d..56ce5b2dd 100644
--- a/src/plasma/private/framesvg_p.h
+++ b/src/plasma/private/framesvg_p.h
@@ -154,7 +154,7 @@ public:
     void generateFrameBackground(FrameData *frame);
     QString cacheId(FrameData *frame, const QString &prefixToUse) const;
     void cacheFrame(const QString &prefixToSave, const QPixmap &background, const QPixmap &overlay);
-    void updateSizes() const;
+    void updateSizes(FrameData *frame) const;
     void updateNeeded();
     void updateAndSignalSizes();
     QSizeF frameSize(FrameData *frame) const;
[prev in list] [next in list] [prev in thread] [next in thread]