alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Initialize scale factor to the last scale factor set on any instance"

Browse Source 
This reverts commit 15f470fafc.
This commit is contained in:
Eike Hein 2017-12-04 03:00:53 +09:00
parent a570254e1a
commit 73b6d92258
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plasma/private/svg_p.h
View File

@ -97,7 +97,6 @@ public:
static QHash<QString, SharedSvgRenderer::Ptr> s_renderers; static QHash<QString, SharedSvgRenderer::Ptr> s_renderers;
static QWeakPointer<Theme> s_systemColorsCache; static QWeakPointer<Theme> s_systemColorsCache;
static qreal s_lastScaleFactor;
Svg *q; Svg *q;
QWeakPointer<Theme> theme; QWeakPointer<Theme> theme;

4
src/plasma/svg.cpp
View File

@ -146,7 +146,7 @@ SvgPrivate::SvgPrivate(Svg *svg)
colorGroup(Plasma::Theme::NormalColorGroup), colorGroup(Plasma::Theme::NormalColorGroup),
lastModified(0), lastModified(0),
devicePixelRatio(1.0), devicePixelRatio(1.0),
scaleFactor(s_lastScaleFactor), scaleFactor(1.0),
status(Svg::Status::Normal), status(Svg::Status::Normal),
multipleImages(false), multipleImages(false),
themed(false), themed(false),
@ -700,7 +700,6 @@ void SvgPrivate::colorsChanged()
QHash<QString, SharedSvgRenderer::Ptr> SvgPrivate::s_renderers; QHash<QString, SharedSvgRenderer::Ptr> SvgPrivate::s_renderers;
QWeakPointer<Theme> SvgPrivate::s_systemColorsCache; QWeakPointer<Theme> SvgPrivate::s_systemColorsCache;
qreal SvgPrivate::s_lastScaleFactor = 1.0;
Svg::Svg(QObject *parent) Svg::Svg(QObject *parent)
: QObject(parent), : QObject(parent),
@ -747,7 +746,6 @@ void Svg::setScaleFactor(qreal ratio)
} }
d->scaleFactor = floor(ratio); d->scaleFactor = floor(ratio);
d->s_lastScaleFactor = d->scaleFactor;
//not resize() because we want to do it unconditionally //not resize() because we want to do it unconditionally
QRectF rect; QRectF rect;