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

Utils: Update Figma text tokens

Browse Source 
This adds UiElementLabelMedium and UiElementLabelSmall.

Change-Id: I592f2bdf7a4d0a98e38ea69c33cf1b27040f7eea
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2024-06-05 13:50:19 +02:00
parent 152307a758
commit 0650fe14e5
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/stylehelper.cpp
View File

@@ -950,6 +950,8 @@ static const UiFontMetrics& uiFontMetrics(StyleHelper::UiElement element)
{StyleHelper::UiElementBody2, {12, 20, QFont::Light}}, {StyleHelper::UiElementBody2, {12, 20, QFont::Light}},
{StyleHelper::UiElementButtonMedium, {12, 16, QFont::Bold}}, {StyleHelper::UiElementButtonMedium, {12, 16, QFont::Bold}},
{StyleHelper::UiElementButtonSmall, {10, 12, QFont::Bold}}, {StyleHelper::UiElementButtonSmall, {10, 12, QFont::Bold}},
{StyleHelper::UiElementLabelMedium, {12, 16, QFont::DemiBold}},
{StyleHelper::UiElementLabelSmall, {10, 12, QFont::DemiBold}},
{StyleHelper::UiElementCaptionStrong, {10, 12, QFont::DemiBold}}, {StyleHelper::UiElementCaptionStrong, {10, 12, QFont::DemiBold}},
{StyleHelper::UiElementCaption, {10, 12, QFont::Normal}}, {StyleHelper::UiElementCaption, {10, 12, QFont::Normal}},
{StyleHelper::UiElementIconStandard, {12, 16, QFont::Medium}}, {StyleHelper::UiElementIconStandard, {12, 16, QFont::Medium}},

4
src/libs/utils/stylehelper.h
View File

@@ -79,6 +79,8 @@ enum ToolbarStyle {
}; };
constexpr ToolbarStyle defaultToolbarStyle = ToolbarStyleCompact; constexpr ToolbarStyle defaultToolbarStyle = ToolbarStyleCompact;
// Keep in sync with:
// SyleHelper::uiFontMetrics, ICore::uiConfigInformation, tst_manual_widgets_uifonts::main
enum UiElement { enum UiElement {
UiElementH1, UiElementH1,
UiElementH2, UiElementH2,
@@ -91,6 +93,8 @@ enum UiElement {
UiElementBody2, UiElementBody2,
UiElementButtonMedium, UiElementButtonMedium,
UiElementButtonSmall, UiElementButtonSmall,
UiElementLabelMedium,
UiElementLabelSmall,
UiElementCaptionStrong, UiElementCaptionStrong,
UiElementCaption, UiElementCaption,
UiElementIconStandard, UiElementIconStandard,

2
src/plugins/coreplugin/icore.cpp
View File

@@ -1068,6 +1068,8 @@ QString uiConfigInformation()
QTC_ADD_UIELEMENT_FONT(Body2); QTC_ADD_UIELEMENT_FONT(Body2);
QTC_ADD_UIELEMENT_FONT(ButtonMedium); QTC_ADD_UIELEMENT_FONT(ButtonMedium);
QTC_ADD_UIELEMENT_FONT(ButtonSmall); QTC_ADD_UIELEMENT_FONT(ButtonSmall);
QTC_ADD_UIELEMENT_FONT(LabelMedium);
QTC_ADD_UIELEMENT_FONT(LabelSmall);
QTC_ADD_UIELEMENT_FONT(CaptionStrong); QTC_ADD_UIELEMENT_FONT(CaptionStrong);
QTC_ADD_UIELEMENT_FONT(Caption); QTC_ADD_UIELEMENT_FONT(Caption);
QTC_ADD_UIELEMENT_FONT(IconStandard); QTC_ADD_UIELEMENT_FONT(IconStandard);

2
tests/manual/widgets/uifonts/tst_manual_widgets_uifonts.cpp
View File

@@ -29,6 +29,8 @@ int main(int argc, char *argv[])
{ StyleHelper::UiElementBody2, "Body-02" }, { StyleHelper::UiElementBody2, "Body-02" },
{ StyleHelper::UiElementButtonMedium, "Button Medium" }, { StyleHelper::UiElementButtonMedium, "Button Medium" },
{ StyleHelper::UiElementButtonSmall, "Button Small" }, { StyleHelper::UiElementButtonSmall, "Button Small" },
{ StyleHelper::UiElementLabelMedium, "Label Medium" },
{ StyleHelper::UiElementLabelSmall, "Label Small" },
{ StyleHelper::UiElementCaptionStrong, "Caption strong" }, { StyleHelper::UiElementCaptionStrong, "Caption strong" },
{ StyleHelper::UiElementCaption, "Caption" }, { StyleHelper::UiElementCaption, "Caption" },
{ StyleHelper::UiElementIconStandard, "Icon Standard" }, { StyleHelper::UiElementIconStandard, "Icon Standard" },