mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 01:04:50 +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,