forked from qt-creator/qt-creator
Welcome: Design update round
User feedback was gathered and in part implemented in form of a design update: - Update dark and light tokens - Add Token_Text_Accent and use it for session/sroject names, tags, etc. - Change card hover from Token_Foreground_Subtle to Token_Background_Subtle - Remove font-style changes on hover Change-Id: Ia428d43828c9c76ea91d142356457846b932e2d6 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -5,21 +5,22 @@
|
|||||||
Token_Basic_Black=ff131313
|
Token_Basic_Black=ff131313
|
||||||
Token_Basic_White=fff8f8f8
|
Token_Basic_White=fff8f8f8
|
||||||
|
|
||||||
Token_Accent_Default=ff23b26a
|
Token_Accent_Default=ff1F9B5D
|
||||||
Token_Accent_Muted=ff1f9b5d
|
Token_Accent_Muted=ff228C57
|
||||||
Token_Accent_Subtle=ff1a8550
|
Token_Accent_Subtle=ff1F7A4D
|
||||||
|
|
||||||
Token_Background_Default=ff1f1f1f
|
Token_Background_Default=ff1f1f1f
|
||||||
Token_Background_Muted=ff262626
|
Token_Background_Muted=ff262626
|
||||||
Token_Background_Subtle=ff2e2e2e
|
Token_Background_Subtle=ff2e2e2e
|
||||||
|
|
||||||
Token_Foreground_Default=ff5a5a5a
|
Token_Foreground_Default=ff474747
|
||||||
Token_Foreground_Muted=ff3e3e3e
|
Token_Foreground_Muted=ff353535
|
||||||
Token_Foreground_Subtle=ff303030
|
Token_Foreground_Subtle=ff2A2A2A
|
||||||
|
|
||||||
Token_Text_Default=fff8f8f8
|
Token_Text_Default=ffF8F8F8
|
||||||
Token_Text_Muted=ffaeaeae
|
Token_Text_Muted=ffAEAEAE
|
||||||
Token_Text_Subtle=ff595959
|
Token_Text_Subtle=ff595959
|
||||||
|
Token_Text_Accent=ff23B26A
|
||||||
|
|
||||||
Token_Stroke_Strong=ffeeeeee
|
Token_Stroke_Strong=ffeeeeee
|
||||||
Token_Stroke_Muted=ff727272
|
Token_Stroke_Muted=ff727272
|
||||||
|
@@ -10,16 +10,17 @@ Token_Accent_Muted=ff1f9b5d
|
|||||||
Token_Accent_Subtle=ff1a8550
|
Token_Accent_Subtle=ff1a8550
|
||||||
|
|
||||||
Token_Background_Default=fffcfcfc
|
Token_Background_Default=fffcfcfc
|
||||||
Token_Background_Muted=ffefefef
|
Token_Background_Muted=ffF2F2F2
|
||||||
Token_Background_Subtle=ffe7e7e7
|
Token_Background_Subtle=ffe7e7e7
|
||||||
|
|
||||||
Token_Foreground_Default=ffcdcdcd
|
Token_Foreground_Default=ffD8D8D8
|
||||||
Token_Foreground_Muted=ffd5d5d5
|
Token_Foreground_Muted=ffE3E3E3
|
||||||
Token_Foreground_Subtle=ffdddddd
|
Token_Foreground_Subtle=ffEFEFEF
|
||||||
|
|
||||||
Token_Text_Default=ff393939
|
Token_Text_Default=ff393939
|
||||||
Token_Text_Muted=ff6a6a6a
|
Token_Text_Muted=ff6a6a6a
|
||||||
Token_Text_Subtle=ffbebebe
|
Token_Text_Subtle=ffbebebe
|
||||||
|
Token_Text_Accent=ff28C878
|
||||||
|
|
||||||
Token_Stroke_Strong=ff464646
|
Token_Stroke_Strong=ff464646
|
||||||
Token_Stroke_Muted=ff727272
|
Token_Stroke_Muted=ff727272
|
||||||
|
@@ -239,6 +239,7 @@ public:
|
|||||||
Token_Text_Default,
|
Token_Text_Default,
|
||||||
Token_Text_Muted,
|
Token_Text_Muted,
|
||||||
Token_Text_Subtle,
|
Token_Text_Subtle,
|
||||||
|
Token_Text_Accent,
|
||||||
Token_Stroke_Strong,
|
Token_Stroke_Strong,
|
||||||
Token_Stroke_Muted,
|
Token_Stroke_Muted,
|
||||||
Token_Stroke_Subtle,
|
Token_Stroke_Subtle,
|
||||||
|
@@ -111,13 +111,12 @@ static const TextFormat &buttonTF(Button::Role role, WidgetState state)
|
|||||||
static const TextFormat smallListDefaultTF
|
static const TextFormat smallListDefaultTF
|
||||||
{Theme::Token_Text_Default, StyleHelper::UiElement::UiElementIconStandard,
|
{Theme::Token_Text_Default, StyleHelper::UiElement::UiElementIconStandard,
|
||||||
Qt::AlignLeft | Qt::AlignVCenter | Qt::TextDontClip};
|
Qt::AlignLeft | Qt::AlignVCenter | Qt::TextDontClip};
|
||||||
static const TextFormat smallListCheckedTF
|
static const TextFormat smallListCheckedTF = smallListDefaultTF;
|
||||||
{smallListDefaultTF.themeColor, StyleHelper::UiElement::UiElementIconActive,
|
|
||||||
smallListDefaultTF.drawTextFlags};
|
|
||||||
static const TextFormat smallLinkDefaultTF
|
static const TextFormat smallLinkDefaultTF
|
||||||
{Theme::Token_Text_Default, smallListDefaultTF.uiElement, smallListDefaultTF.drawTextFlags};
|
{Theme::Token_Text_Default, StyleHelper::UiElement::UiElementIconStandard,
|
||||||
|
smallListDefaultTF.drawTextFlags};
|
||||||
static const TextFormat smallLinkHoveredTF
|
static const TextFormat smallLinkHoveredTF
|
||||||
{Theme::Token_Accent_Default, smallListCheckedTF.uiElement,
|
{Theme::Token_Text_Accent, smallLinkDefaultTF.uiElement,
|
||||||
smallLinkDefaultTF.drawTextFlags};
|
smallLinkDefaultTF.drawTextFlags};
|
||||||
|
|
||||||
switch (role) {
|
switch (role) {
|
||||||
@@ -754,7 +753,7 @@ bool ListModelFilter::leaveFilterAcceptsRowBeforeFiltering(const ListItem *, boo
|
|||||||
constexpr TextFormat titleTF {Theme::Token_Text_Default, StyleHelper::UiElementIconActive};
|
constexpr TextFormat titleTF {Theme::Token_Text_Default, StyleHelper::UiElementIconActive};
|
||||||
constexpr TextFormat descriptionTF {titleTF.themeColor, StyleHelper::UiElementCaption};
|
constexpr TextFormat descriptionTF {titleTF.themeColor, StyleHelper::UiElementCaption};
|
||||||
constexpr TextFormat tagsLabelTF {Theme::Token_Text_Muted, StyleHelper::UiElementCaptionStrong};
|
constexpr TextFormat tagsLabelTF {Theme::Token_Text_Muted, StyleHelper::UiElementCaptionStrong};
|
||||||
constexpr TextFormat tagsTF {Theme::Token_Accent_Default, tagsLabelTF.uiElement};
|
constexpr TextFormat tagsTF {Theme::Token_Text_Accent, tagsLabelTF.uiElement};
|
||||||
|
|
||||||
constexpr qreal itemOutlineWidth = 1;
|
constexpr qreal itemOutlineWidth = 1;
|
||||||
constexpr qreal itemCornerRounding = 6;
|
constexpr qreal itemCornerRounding = 6;
|
||||||
@@ -1157,7 +1156,7 @@ static QLabel *createTitleLabel(const QString &text, QWidget *parent = nullptr)
|
|||||||
|
|
||||||
static QLabel *createLinkLabel(const QString &text, QWidget *parent)
|
static QLabel *createLinkLabel(const QString &text, QWidget *parent)
|
||||||
{
|
{
|
||||||
constexpr TextFormat headerLinkTF {Theme::Token_Accent_Default, StyleHelper::UiElementH6};
|
constexpr TextFormat headerLinkTF {Theme::Token_Text_Accent, StyleHelper::UiElementH6};
|
||||||
const QString linkColor = themeColor(headerLinkTF.themeColor).name();
|
const QString linkColor = themeColor(headerLinkTF.themeColor).name();
|
||||||
auto link = new QLabel("<a href=\"link\" style=\"color: " + linkColor + ";\">"
|
auto link = new QLabel("<a href=\"link\" style=\"color: " + linkColor + ";\">"
|
||||||
+ text + "</a>", parent);
|
+ text + "</a>", parent);
|
||||||
|
@@ -61,7 +61,7 @@ CORE_EXPORT void setBackgroundColor(QWidget *widget, Utils::Theme::Color colorRo
|
|||||||
constexpr qreal defaultCardBackgroundRounding = 3.75;
|
constexpr qreal defaultCardBackgroundRounding = 3.75;
|
||||||
constexpr Utils::Theme::Color cardDefaultBackground = Utils::Theme::Token_Background_Muted;
|
constexpr Utils::Theme::Color cardDefaultBackground = Utils::Theme::Token_Background_Muted;
|
||||||
constexpr Utils::Theme::Color cardDefaultStroke = Utils::Theme::Token_Stroke_Subtle;
|
constexpr Utils::Theme::Color cardDefaultStroke = Utils::Theme::Token_Stroke_Subtle;
|
||||||
constexpr Utils::Theme::Color cardHoverBackground = Utils::Theme::Token_Foreground_Subtle;
|
constexpr Utils::Theme::Color cardHoverBackground = Utils::Theme::Token_Background_Subtle;
|
||||||
constexpr Utils::Theme::Color cardHoverStroke = cardHoverBackground;
|
constexpr Utils::Theme::Color cardHoverStroke = cardHoverBackground;
|
||||||
CORE_EXPORT void drawCardBackground(QPainter *painter, const QRectF &rect,
|
CORE_EXPORT void drawCardBackground(QPainter *painter, const QRectF &rect,
|
||||||
const QBrush &fill, const QPen &pen = QPen(Qt::NoPen),
|
const QBrush &fill, const QPen &pen = QPen(Qt::NoPen),
|
||||||
|
@@ -47,7 +47,7 @@ const char PROJECT_BASE_ID[] = "Welcome.OpenRecentProject";
|
|||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
|
|
||||||
constexpr TextFormat projectNameTF {Theme::Token_Accent_Default, StyleHelper::UiElementH5};
|
constexpr TextFormat projectNameTF {Theme::Token_Text_Accent, StyleHelper::UiElementH5};
|
||||||
constexpr TextFormat projectPathTF {Theme::Token_Text_Muted, StyleHelper::UiElementIconActive};
|
constexpr TextFormat projectPathTF {Theme::Token_Text_Muted, StyleHelper::UiElementIconActive};
|
||||||
constexpr TextFormat sessionNameTF {projectNameTF.themeColor, projectNameTF.uiElement};
|
constexpr TextFormat sessionNameTF {projectNameTF.themeColor, projectNameTF.uiElement};
|
||||||
constexpr TextFormat sessionProjetNameTF {Theme::Token_Text_Default, projectNameTF.uiElement};
|
constexpr TextFormat sessionProjetNameTF {Theme::Token_Text_Default, projectNameTF.uiElement};
|
||||||
|
Reference in New Issue
Block a user