aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue #650. "Seam allowance tool" icons are not showing correctly.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-04-03 12:39:17 +03:00
parent c7a531b06e
commit 0612305ea8
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/vwidgets/fancytabbar/stylehelper.cpp
View File

@ -38,6 +38,8 @@
#include <QStyleOption> #include <QStyleOption>
#include <QObject> #include <QObject>
#include "../vmisc/vmath.h"
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
qreal StyleHelper::sidebarFontSize() qreal StyleHelper::sidebarFontSize()
{ {
@ -122,14 +124,22 @@ void StyleHelper::setBaseColor(const QColor &newcolor)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
// Draws a cached pixmap with shadow // Draws a cached pixmap with shadow
void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, QPainter *p, QIcon::Mode iconMode, void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, QPainter *p, QIcon::Mode iconMode,
int radius, const QColor &color, const QPoint &offset) int dipRadius, const QColor &color, const QPoint &dipOffset)
{ {
QPixmap cache; QPixmap cache;
QString pixmapName = QString::fromLatin1("icon %0 %1 %2").arg(icon.cacheKey()).arg(iconMode).arg(rect.height()); QString pixmapName = QString::fromLatin1("icon %0 %1 %2").arg(icon.cacheKey()).arg(iconMode).arg(rect.height());
if (!QPixmapCache::find(pixmapName, cache)) if (!QPixmapCache::find(pixmapName, cache))
{ {
// High-dpi support: The in parameters (rect, radius, offset) are in
// device-independent pixels. The call to QIcon::pixmap() below might
// return a high-dpi pixmap, which will in that case have a devicePixelRatio
// different than 1. The shadow drawing caluculations are done in device
// pixels.
QPixmap px = icon.pixmap(rect.size()); QPixmap px = icon.pixmap(rect.size());
int devicePixelRatio = qCeil(px.devicePixelRatio());
int radius = dipRadius * devicePixelRatio;
QPoint offset = dipOffset * devicePixelRatio;
cache = QPixmap(px.size() + QSize(radius * 2, radius * 2)); cache = QPixmap(px.size() + QSize(radius * 2, radius * 2));
cache.fill(Qt::transparent); cache.fill(Qt::transparent);
@ -157,7 +167,7 @@ void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, QPain
QPainter tmpPainter(&tmp); QPainter tmpPainter(&tmp);
tmpPainter.setCompositionMode(QPainter::CompositionMode_Source); tmpPainter.setCompositionMode(QPainter::CompositionMode_Source);
tmpPainter.drawPixmap(QPoint(radius, radius), px); tmpPainter.drawPixmap(QRect(radius, radius, px.width(), px.height()), px);
tmpPainter.end(); tmpPainter.end();
// blur the alpha channel // blur the alpha channel
@ -184,11 +194,13 @@ void StyleHelper::drawIconWithShadow(const QIcon &icon, const QRect &rect, QPain
cachePainter.drawImage(QRect(0, 0, cache.rect().width(), cache.rect().height()), tmp); cachePainter.drawImage(QRect(0, 0, cache.rect().width(), cache.rect().height()), tmp);
// Draw the actual pixmap... // Draw the actual pixmap...
cachePainter.drawPixmap(QPoint(radius, radius) + offset, px); cachePainter.drawPixmap(QRect(QPoint(radius, radius) + offset, QSize(px.width(), px.height())), px);
cache.setDevicePixelRatio(devicePixelRatio);
QPixmapCache::insert(pixmapName, cache); QPixmapCache::insert(pixmapName, cache);
} }
QRect targetRect = cache.rect(); QRect targetRect = cache.rect();
targetRect.moveCenter(rect.center()); targetRect.setSize(targetRect.size() / cache.devicePixelRatio());
p->drawPixmap(targetRect.topLeft() - offset, cache); targetRect.moveCenter(rect.center() - dipOffset);
p->drawPixmap(targetRect, cache);
} }

4
src/libs/vwidgets/fancytabbar/stylehelper.h
View File

@ -57,8 +57,8 @@ public:
// Sets the base color and makes sure all top level widgets are updated // Sets the base color and makes sure all top level widgets are updated
static void setBaseColor(const QColor &color); static void setBaseColor(const QColor &color);
static void drawIconWithShadow(const QIcon &icon, const QRect &rect, QPainter *p, QIcon::Mode iconMode, static void drawIconWithShadow(const QIcon &icon, const QRect &rect, QPainter *p, QIcon::Mode iconMode,
int radius = 3, const QColor &color = QColor(0, 0, 0, 130), int dipRadius = 3, const QColor &color = QColor(0, 0, 0, 130),
const QPoint &offset = QPoint(1, -2)); const QPoint &dipOffset = QPoint(1, -2));
private: private:
static QColor m_baseColor; static QColor m_baseColor;