mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Move widget strings from localisation to Widget.h (#22279)

Browse Source
This commit is contained in:
Aaron van Geffen
2024-07-12 20:47:56 +02:00
committed by GitHub
parent 749a1d5ac3
commit cee2eb1461
8 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2-ui/interface/Widget.cpp
View File

@@ -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<const char*>(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<const char*>(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<const char*>(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<const char*>(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<const char*>(BlackDownArrowString));
DrawText(dpi, { l + 1, b - (kScrollBarWidth - 1) }, {}, kBlackDownArrowString);
}
/**

7
src/openrct2-ui/interface/Widget.h
View File

@@ -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,

2
src/openrct2-ui/windows/AssetPacks.cpp
View File

@@ -265,7 +265,7 @@ static Widget WindowAssetPacksWidgets[] = {
{
auto checkmark = Formatter();
checkmark.Add<StringId>(STR_STRING);
checkmark.Add<char*>(CheckBoxMarkString);
checkmark.Add<char*>(kCheckMarkString);
DrawTextBasic(
dpi, ScreenCoordsXY{ rect.GetLeft() + 1, rect.GetTop() }, STR_WINDOW_COLOUR_2_STRINGID, checkmark);
}

4
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@@ -754,9 +754,7 @@ static std::vector<Widget> _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<const char*>(CheckBoxMarkString));
DrawText(dpi, screenCoords, { colour2, FontStyle::Medium, darkness }, kCheckMarkString);
}
screenCoords.x = gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER ? 0 : 15;

2
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@@ -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<const char*>(CheckBoxMarkString));
kCheckMarkString);
}
// Ride name

3
src/openrct2-ui/windows/Themes.cpp
View File

@@ -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<const char*>(CheckBoxMarkString));
dpi, topLeft, { colours[1].colour, FontStyle::Medium, TextDarkness::Dark }, kCheckMarkString);
}
}
}

4
src/openrct2-ui/windows/TileInspector.cpp
View File

@@ -1619,7 +1619,7 @@ static uint64_t PageDisabledWidgets[] = {
auto checkboxFormatter = Formatter();
checkboxFormatter.Add<StringId>(STR_STRING);
checkboxFormatter.Add<char*>(CheckBoxMarkString);
checkboxFormatter.Add<char*>(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<StringId>(STR_STRING);
eyeFormatter.Add<char*>(EyeString);
eyeFormatter.Add<char*>(kEyeString);
DrawTextBasic(dpi, screenCoords + ScreenCoordsXY{ 2, 1 }, stringFormat, eyeFormatter);
}

7
src/openrct2/localisation/Language.h
View File

@@ -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);