feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Fix missing DetailsWidget outline

Browse Source 
On some systems, QPalette::Midlight can have the same color as the
background color. So instead of using QPalette::Midlight on non-macOS,
mix our own color with 15% text color intensity, to visually match what
Qt Creator < 9.0 did.

Change-Id: I40848b5e16344c07f42c20415194f893641d5f70
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2022-10-13 13:03:01 +02:00
parent d47a72e26c
commit 54f7ebf001
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/utils/detailsbutton.cpp
View File

@@ -5,6 +5,7 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/icon.h> #include <utils/icon.h>
#include <utils/stylehelper.h>
#include <QGraphicsOpacityEffect> #include <QGraphicsOpacityEffect>
#include <QGuiApplication> #include <QGuiApplication>
@@ -81,6 +82,14 @@ QSize DetailsButton::sizeHint() const
spacing + fontMetrics().height() + spacing); spacing + fontMetrics().height() + spacing);
} }
QColor DetailsButton::outlineColor()
{
return HostOsInfo::isMacHost()
? QGuiApplication::palette().color(QPalette::Mid)
: StyleHelper::mergedColors(creatorTheme()->color(Theme::TextColorNormal),
creatorTheme()->color(Theme::BackgroundColorNormal), 15);
}
void DetailsButton::paintEvent(QPaintEvent *e) void DetailsButton::paintEvent(QPaintEvent *e)
{ {
Q_UNUSED(e) Q_UNUSED(e)
@@ -93,11 +102,8 @@ void DetailsButton::paintEvent(QPaintEvent *e)
p.restore(); p.restore();
} }
if (!creatorTheme()->flag(Theme::FlatProjectsMode)) { if (!creatorTheme()->flag(Theme::FlatProjectsMode))
const QColor outlineColor = palette().color(HostOsInfo::isMacHost() ? QPalette::Mid qDrawPlainRect(&p, rect(), outlineColor());
: QPalette::Midlight);
qDrawPlainRect(&p, rect(), outlineColor);
}
const QRect textRect(spacing + 3, 0, width(), height()); const QRect textRect(spacing + 3, 0, width(), height());
p.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text()); p.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, text());

1
src/libs/utils/detailsbutton.h
View File

@@ -49,6 +49,7 @@ class QTCREATOR_UTILS_EXPORT DetailsButton : public ExpandButton
public: public:
DetailsButton(QWidget *parent = nullptr); DetailsButton(QWidget *parent = nullptr);
QSize sizeHint() const override; QSize sizeHint() const override;
static QColor outlineColor();
private: private:
void paintEvent(QPaintEvent *e) override; void paintEvent(QPaintEvent *e) override;

7
src/libs/utils/detailswidget.cpp
View File

@@ -227,11 +227,8 @@ void DetailsWidget::paintEvent(QPaintEvent *paintEvent)
: palette().color(QPalette::Window); : palette().color(QPalette::Window);
p.fillRect(rect(), bgColor); p.fillRect(rect(), bgColor);
} }
if (!creatorTheme()->flag(Theme::FlatProjectsMode)) { if (!creatorTheme()->flag(Theme::FlatProjectsMode))
const QColor outlineColor = palette().color(HostOsInfo::isMacHost() ? QPalette::Mid qDrawPlainRect(&p, rect(), DetailsButton::outlineColor());
: QPalette::Midlight);
qDrawPlainRect(&p, rect(), outlineColor);
}
} }
void DetailsWidget::enterEvent(QEnterEvent *event) void DetailsWidget::enterEvent(QEnterEvent *event)