diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index f7ca2652b5..db72c111cd 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -641,8 +641,7 @@ static void WidgetCheckboxDraw(DrawPixelInfo& dpi, WindowBase& w, WidgetIndex wi if (WidgetIsPressed(w, widgetIndex)) { DrawText( - dpi, { midLeft - ScreenCoordsXY{ 0, 5 } }, { colour.withFlag(ColourFlag::translucent, false) }, - static_cast(CheckBoxMarkString)); + dpi, { midLeft - ScreenCoordsXY{ 0, 5 } }, { colour.withFlag(ColourFlag::translucent, false) }, kCheckMarkString); } // draw the text @@ -743,7 +742,7 @@ static void WidgetHScrollbarDraw( uint8_t flags = (scroll.flags & HSCROLLBAR_LEFT_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0; GfxFillRectInset(dpi, { { l, t }, { l + (kScrollBarWidth - 1), b } }, colour, flags); - DrawText(dpi, { l + 1, t }, {}, static_cast(BlackLeftArrowString)); + DrawText(dpi, { l + 1, t }, {}, kBlackLeftArrowString); } // Thumb @@ -760,7 +759,7 @@ static void WidgetHScrollbarDraw( uint8_t flags = (scroll.flags & HSCROLLBAR_RIGHT_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0; GfxFillRectInset(dpi, { { r - (kScrollBarWidth - 1), t }, { r, b } }, colour, flags); - DrawText(dpi, { r - 6, t }, {}, static_cast(BlackRightArrowString)); + DrawText(dpi, { r - 6, t }, {}, kBlackRightArrowString); } } @@ -782,7 +781,7 @@ static void WidgetVScrollbarDraw( GfxFillRectInset( dpi, { { l, t }, { r, t + (kScrollBarWidth - 1) } }, colour, ((scroll.flags & VSCROLLBAR_UP_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0)); - DrawText(dpi, { l + 1, t - 1 }, {}, static_cast(BlackUpArrowString)); + DrawText(dpi, { l + 1, t - 1 }, {}, kBlackUpArrowString); // Thumb GfxFillRectInset( @@ -795,7 +794,7 @@ static void WidgetVScrollbarDraw( GfxFillRectInset( dpi, { { l, b - (kScrollBarWidth - 1) }, { r, b } }, colour, ((scroll.flags & VSCROLLBAR_DOWN_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0)); - DrawText(dpi, { l + 1, b - (kScrollBarWidth - 1) }, {}, static_cast(BlackDownArrowString)); + DrawText(dpi, { l + 1, b - (kScrollBarWidth - 1) }, {}, kBlackDownArrowString); } /** diff --git a/src/openrct2-ui/interface/Widget.h b/src/openrct2-ui/interface/Widget.h index b7f36d242a..b9ef002a5e 100644 --- a/src/openrct2-ui/interface/Widget.h +++ b/src/openrct2-ui/interface/Widget.h @@ -26,6 +26,13 @@ constexpr auto kBarBlink = (1u << 31); constexpr uint8_t kScrollBarWidth = 10; constexpr ScreenSize kTabSize = { 31, 27 }; +constexpr const char* kBlackUpArrowString = u8"{BLACK}▲"; +constexpr const char* kBlackDownArrowString = u8"{BLACK}▼"; +constexpr const char* kBlackLeftArrowString = u8"{BLACK}◀"; +constexpr const char* kBlackRightArrowString = u8"{BLACK}▶"; +constexpr const char* kCheckMarkString = u8"✓"; +constexpr const char* kEyeString = u8"👁"; + enum class WindowColour : uint8_t { Primary, diff --git a/src/openrct2-ui/windows/AssetPacks.cpp b/src/openrct2-ui/windows/AssetPacks.cpp index 5d8c885bad..1c630272b1 100644 --- a/src/openrct2-ui/windows/AssetPacks.cpp +++ b/src/openrct2-ui/windows/AssetPacks.cpp @@ -265,7 +265,7 @@ static Widget WindowAssetPacksWidgets[] = { { auto checkmark = Formatter(); checkmark.Add(STR_STRING); - checkmark.Add(CheckBoxMarkString); + checkmark.Add(kCheckMarkString); DrawTextBasic( dpi, ScreenCoordsXY{ rect.GetLeft() + 1, rect.GetTop() }, STR_WINDOW_COLOUR_2_STRINGID, checkmark); } diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 0971266c0c..4049ffb347 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -754,9 +754,7 @@ static std::vector _window_editor_object_selection_widgets = { if (*listItem.flags & (ObjectSelectionFlags::InUse | ObjectSelectionFlags::AlwaysRequired)) colour2.setFlag(ColourFlag::inset, true); - DrawText( - dpi, screenCoords, { colour2, FontStyle::Medium, darkness }, - static_cast(CheckBoxMarkString)); + DrawText(dpi, screenCoords, { colour2, FontStyle::Medium, darkness }, kCheckMarkString); } screenCoords.x = gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER ? 0 : 15; diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index a94967d25f..fca949b06f 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -1172,7 +1172,7 @@ static uint64_t window_editor_objective_options_page_hold_down_widgets[] = { auto darkness = stringId == STR_WINDOW_COLOUR_2_STRINGID ? TextDarkness::ExtraDark : TextDarkness::Dark; DrawText( dpi, { 2, y }, { colours[1].withFlag(ColourFlag::translucent, false), FontStyle::Medium, darkness }, - static_cast(CheckBoxMarkString)); + kCheckMarkString); } // Ride name diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index dcd919d64f..43e9e7e58f 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -806,8 +806,7 @@ static WindowClass window_themes_tab_7_classes[] = { if (colour.hasFlag(ColourFlag::translucent)) { DrawText( - dpi, topLeft, { colours[1].colour, FontStyle::Medium, TextDarkness::Dark }, - static_cast(CheckBoxMarkString)); + dpi, topLeft, { colours[1].colour, FontStyle::Medium, TextDarkness::Dark }, kCheckMarkString); } } } diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 3101e7deae..f22c93c44a 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -1619,7 +1619,7 @@ static uint64_t PageDisabledWidgets[] = { auto checkboxFormatter = Formatter(); checkboxFormatter.Add(STR_STRING); - checkboxFormatter.Add(CheckBoxMarkString); + checkboxFormatter.Add(kCheckMarkString); // Draw checkbox and check if visible GfxFillRectInset(dpi, { { 2, screenCoords.y }, { 15, screenCoords.y + 11 } }, colours[1], INSET_RECT_F_E0); @@ -1627,7 +1627,7 @@ static uint64_t PageDisabledWidgets[] = { { auto eyeFormatter = Formatter(); eyeFormatter.Add(STR_STRING); - eyeFormatter.Add(EyeString); + eyeFormatter.Add(kEyeString); DrawTextBasic(dpi, screenCoords + ScreenCoordsXY{ 2, 1 }, stringFormat, eyeFormatter); } diff --git a/src/openrct2/localisation/Language.h b/src/openrct2/localisation/Language.h index d9bbff487a..4a3f5b5249 100644 --- a/src/openrct2/localisation/Language.h +++ b/src/openrct2/localisation/Language.h @@ -85,13 +85,6 @@ struct LanguageDescriptor extern const LanguageDescriptor LanguagesDescriptors[LANGUAGE_COUNT]; -constexpr const char* BlackUpArrowString = u8"{BLACK}▲"; -constexpr const char* BlackDownArrowString = u8"{BLACK}▼"; -constexpr const char* BlackLeftArrowString = u8"{BLACK}◀"; -constexpr const char* BlackRightArrowString = u8"{BLACK}▶"; -constexpr const char* CheckBoxMarkString = u8"✓"; -constexpr const char* EyeString = u8"👁"; - uint8_t LanguageGetIDFromLocale(const char* locale); const char* LanguageGetString(StringId id); bool LanguageOpen(int32_t id);