kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-02 21:47:22 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v0.10'

Browse Source
This commit is contained in:
Pino Toscano 2021-12-19 08:23:18 +01:00
commit 362b21ee08
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/org.kde.latte-dock.appdata.xml.cmake
View File

@ -210,8 +210,9 @@
<binary>latte-dock</binary>
<library>liblatte2plugin.so</library>
</provides>
<launchable type="desktop-id">org.kde.latte-dock.desktop</launchable>
<releases>
​ <release version="0.9.1" date="2019-08-04"/>
<release version="0.9.1" date="2019-08-04"/>
<release version="0.9.0" date="2019-07-28"/>
<release version="0.8.9" date="2019-06-28"/>
<release version="0.8.8" date="2019-04-14"/>
@ -227,10 +228,10 @@
<release version="0.7.4" date="2018-03-05"/>
<release version="0.7.3" date="2018-01-07"/>
<release version="0.7.2" date="2017-11-12"/>
​ <release version="0.7.1" date="2017-08-31"/>
​ <release version="0.7.0" date="2017-08-11"/>
​ <release version="0.6.2" date="2017-05-09"/>
​ <release version="0.6.1" date="2017-05-05"/>
​ <release version="0.6.0" date="2017-04-02"/>
​ </releases>
<release version="0.7.1" date="2017-08-31"/>
<release version="0.7.0" date="2017-08-11"/>
<release version="0.6.2" date="2017-05-09"/>
<release version="0.6.1" date="2017-05-05"/>
<release version="0.6.0" date="2017-04-02"/>
</releases>
</component>

21
app/plasma/extended/panelbackground.cpp
View File

@ -11,6 +11,7 @@
// Qt
#include <QDebug>
#include <QImage>
#include <QtGlobal>
#define CENTERWIDTH 100
#define CENTERHEIGHT 50
@ -121,7 +122,11 @@ void PanelBackground::updateMaxOpacity(Plasma::Svg *svg)
QImage center = svg->image(QSize(CENTERWIDTH, CENTERHEIGHT), element(svg, "center"));
if (center.format() != QImage::Format_ARGB32_Premultiplied) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
center.convertTo(QImage::Format_ARGB32_Premultiplied);
#else
center = center.convertToFormat(QImage::Format_ARGB32_Premultiplied);
#endif
}
float alphasum{0};
@ -168,7 +173,11 @@ void PanelBackground::updateRoundnessFromMask(Plasma::Svg *svg)
QImage corner = svg->image(svg->elementSize(cornerId), cornerId);
if (corner.format() != QImage::Format_ARGB32_Premultiplied) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
corner.convertTo(QImage::Format_ARGB32_Premultiplied);
#else
corner = corner.convertToFormat(QImage::Format_ARGB32_Premultiplied);
#endif
}
int baseRow = (topLeftCorner ? corner.height()-1 : 0);
@ -336,7 +345,11 @@ void PanelBackground::updateRoundnessFromShadows(Plasma::Svg *svg)
QImage corner = svg->image(svg->elementSize(cornerId), cornerId);
if (corner.format() != QImage::Format_ARGB32_Premultiplied) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
corner.convertTo(QImage::Format_ARGB32_Premultiplied);
#else
corner = corner.convertToFormat(QImage::Format_ARGB32_Premultiplied);
#endif
}
int baseRow = (topLeftCorner ? corner.height()-1 : 0);
@ -497,7 +510,11 @@ void PanelBackground::updateRoundnessFallback(Plasma::Svg *svg)
QImage corner = svg->image(svg->elementSize(cornerId), cornerId);
if (corner.format() != QImage::Format_ARGB32_Premultiplied) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
corner.convertTo(QImage::Format_ARGB32_Premultiplied);
#else
corner = corner.convertToFormat(QImage::Format_ARGB32_Premultiplied);
#endif
}
int discovRow = (m_location == Plasma::Types::LeftEdge ? corner.height()-1 : 0);
@ -569,7 +586,11 @@ void PanelBackground::updateShadow(Plasma::Svg *svg)
QImage border = svg->image(svg->elementSize(borderId), borderId);
if (border.format() != QImage::Format_ARGB32_Premultiplied) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
border.convertTo(QImage::Format_ARGB32_Premultiplied);
#else
border = border.convertToFormat(QImage::Format_ARGB32_Premultiplied);
#endif
}
//! find shadow size through, plasma theme