d8a1a9eb08
Summary: give frameSvg the concept of repaintBlocked(), that enables and disables the regeneration of the frame data when a property is set. the use case is when often, a lot of properties are set one after the other (such as prefix, enabled borders, size) collapse the formely similar, but a bit different logic of frame regeneration is a single function for better maintanability. QML FrameSvgItem sets repaintblocked when it starts and releases it just on oncomponentCompleted Test Plan: plasmashell still starts, autotests still work, all frames are rendered correctly the destruction of old frames is cutted by 50%. in the qml profiler the creation time of a framesvgitem slightly improved, on this machine from around 26 msecs to around 21, can still be improved, but at least the code is a bit simpler Reviewers: #plasma Subscribers: davidedmundson, plasma-devel, #frameworks Tags: #plasma, #frameworks Differential Revision: https://phabricator.kde.org/D4414
96 lines
3.7 KiB
C++
96 lines
3.7 KiB
C++
/********************************************************************************
|
|
* Copyright 2014 Marco Martin <mart@kde.org> *
|
|
* *
|
|
* This library is free software; you can redistribute it and/or *
|
|
* modify it under the terms of the GNU Library General Public *
|
|
* License as published by the Free Software Foundation; either *
|
|
* version 2 of the License, or (at your option) any later version. *
|
|
* *
|
|
* This library is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
|
|
* Library General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU Library General Public License *
|
|
* along with this library; see the file COPYING.LIB. If not, write to *
|
|
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, *
|
|
* Boston, MA 02110-1301, USA. *
|
|
*********************************************************************************/
|
|
|
|
#include "framesvgtest.h"
|
|
#include <QStandardPaths>
|
|
|
|
|
|
|
|
void FrameSvgTest::initTestCase()
|
|
{
|
|
QStandardPaths::enableTestMode(true);
|
|
m_cacheDir = QDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
|
|
m_cacheDir.removeRecursively();
|
|
|
|
m_frameSvg = new Plasma::FrameSvg;
|
|
m_frameSvg->setImagePath(QFINDTESTDATA("data/background.svgz"));
|
|
QVERIFY(m_frameSvg->isValid());
|
|
}
|
|
|
|
void FrameSvgTest::cleanupTestCase()
|
|
{
|
|
delete m_frameSvg;
|
|
|
|
m_cacheDir.removeRecursively();
|
|
}
|
|
|
|
void FrameSvgTest::margins()
|
|
{
|
|
QCOMPARE(m_frameSvg->marginSize(Plasma::Types::LeftMargin), (qreal)26);
|
|
QCOMPARE(m_frameSvg->marginSize(Plasma::Types::TopMargin), (qreal)26);
|
|
QCOMPARE(m_frameSvg->marginSize(Plasma::Types::RightMargin), (qreal)26);
|
|
QCOMPARE(m_frameSvg->marginSize(Plasma::Types::BottomMargin), (qreal)26);
|
|
}
|
|
|
|
void FrameSvgTest::contentsRect()
|
|
{
|
|
m_frameSvg->resizeFrame(QSize(100,100));
|
|
QCOMPARE(m_frameSvg->contentsRect(), QRectF(26, 26, 48, 48));
|
|
}
|
|
|
|
void FrameSvgTest::repaintBlocked()
|
|
{
|
|
//check the properties to be correct even if set during a repaint blocked transaction
|
|
m_frameSvg->setRepaintBlocked(true);
|
|
QVERIFY(m_frameSvg->isRepaintBlocked());
|
|
|
|
m_frameSvg->setElementPrefix("prefix");
|
|
m_frameSvg->setEnabledBorders(Plasma::FrameSvg::TopBorder|Plasma::FrameSvg::LeftBorder);
|
|
m_frameSvg->resizeFrame(QSizeF(100,100));
|
|
|
|
m_frameSvg->setRepaintBlocked(false);
|
|
|
|
QCOMPARE(m_frameSvg->prefix(), QString("prefix"));
|
|
QCOMPARE(m_frameSvg->enabledBorders(), Plasma::FrameSvg::TopBorder|Plasma::FrameSvg::LeftBorder);
|
|
QCOMPARE(m_frameSvg->frameSize(), QSizeF(100,100));
|
|
}
|
|
|
|
void FrameSvgTest::setTheme()
|
|
{
|
|
// Should not crash
|
|
|
|
Plasma::FrameSvg *frameSvg = new Plasma::FrameSvg;
|
|
frameSvg->setImagePath("widgets/background");
|
|
frameSvg->setTheme(new Plasma::Theme("breeze-light", this));
|
|
frameSvg->framePixmap();
|
|
frameSvg->setTheme(new Plasma::Theme("breeze-dark", this));
|
|
frameSvg->framePixmap();
|
|
delete frameSvg;
|
|
|
|
frameSvg = new Plasma::FrameSvg;
|
|
frameSvg->setImagePath("widgets/background");
|
|
frameSvg->setTheme(new Plasma::Theme("breeze-light", this));
|
|
frameSvg->framePixmap();
|
|
frameSvg->setTheme(new Plasma::Theme("breeze-dark", this));
|
|
frameSvg->framePixmap();
|
|
delete frameSvg;
|
|
}
|
|
|
|
QTEST_MAIN(FrameSvgTest)
|