iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix windows colours

Browse Source
This commit is contained in:
Craig Drummond
2018-06-05 18:40:11 +01:00
committed by Craig Drummond
parent 30bc4f5fd2
commit 83f9de3b4a
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
support/fancytabwidget.cpp
View File

@@ -139,7 +139,7 @@ void FancyTabProxyStyle::drawControl(ControlElement element, const QStyleOption
#ifdef Q_OS_MAC
QColor col = OSXStyle::self()->viewPalette().highlight().color();
#elif defined Q_OS_WIN
QColor col = option->palette.highlight().color();
QColor col = active ? option->palette.highlight().color() : QColor(96, 96, 96);
col.setAlphaF(0.25);
#else
QColor col = option->palette.highlight().color();
@@ -429,7 +429,7 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const
#ifdef Q_OS_MAC
QColor col = OSXStyle::self()->viewPalette().highlight().color();
#elif defined Q_OS_WIN
QColor col = palette().highlight().color();
QColor col = palette().currentColorGroup()==QPalette::Active ? palette().highlight().color() : QColor(96, 96, 96);
col.setAlphaF(0.25);
#else
QColor col = palette().highlight().color();

11
support/pagewidget.cpp
View File

@@ -120,10 +120,15 @@ public:
const QString text = index.model()->data(index, Qt::DisplayRole).toString();
const QIcon icon = index.model()->data(index, Qt::DecorationRole).value<QIcon>();
const QPixmap pixmap = icon.pixmap(iconSize, iconSize,
#ifdef Q_OS_WIN
QIcon::Normal
#else
selected &&
( active ||
option.palette.brush(QPalette::Inactive, QPalette::HighlightedText).color()==
option.palette.brush(QPalette::Active, QPalette::HighlightedText).color()) ? QIcon::Selected : QIcon::Normal);
( active ||
option.palette.brush(QPalette::Inactive, QPalette::HighlightedText).color()==
option.palette.brush(QPalette::Active, QPalette::HighlightedText).color()) ? QIcon::Selected : QIcon::Normal
#endif
);
QFontMetrics fm = painter->fontMetrics();
QSize layoutSize = pixmap.isNull() ? QSize(iconSize, iconSize) : (pixmap.size() / pixmap.DEVICE_PIXEL_RATIO());