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

Update members of TextDarkness

Browse Source
This commit is contained in:
Gymnasiast
2025-10-16 20:04:57 +02:00
parent 53be1c6f5c
commit 5e6f5ceb6f
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@@ -313,14 +313,14 @@ namespace OpenRCT2::Ui::Windows
// It needs a {BLACK} token in the string to work properly.
ColourWithFlags colour = { COLOUR_BLACK };
FontStyle fontStyle = FontStyle::Medium;
auto darkness = TextDarkness::Regular;
auto darkness = TextDarkness::regular;
if (researchItem.IsAlwaysResearched())
{
if (_selectedResearchItem == &researchItem && dragItem == nullptr)
darkness = TextDarkness::ExtraDark;
darkness = TextDarkness::extraDark;
else
darkness = TextDarkness::Dark;
darkness = TextDarkness::dark;
colour = colours[1].withFlag(ColourFlag::inset, true);
}

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

@@ -761,7 +761,7 @@ namespace OpenRCT2::Ui::Windows
&& (*listItem.flags & ObjectSelectionFlags::Selected))
{
screenCoords.x = 2;
auto darkness = highlighted ? TextDarkness::ExtraDark : TextDarkness::Dark;
auto darkness = highlighted ? TextDarkness::extraDark : TextDarkness::dark;
auto colour2 = colours[1].withFlag(ColourFlag::translucent, false);
if (*listItem.flags & (ObjectSelectionFlags::InUse | ObjectSelectionFlags::AlwaysRequired))
colour2.setFlag(ColourFlag::inset, true);
@@ -776,11 +776,11 @@ namespace OpenRCT2::Ui::Windows
auto buffer = strchr(bufferWithColour, '\0');
colour_t colour = COLOUR_BLACK;
auto darkness = TextDarkness::Regular;
auto darkness = TextDarkness::regular;
if (*listItem.flags & ObjectSelectionFlags::Flag6)
{
colour = colours[1].colour;
darkness = TextDarkness::Dark;
darkness = TextDarkness::dark;
}
int32_t width_limit = widgets[WIDX_LIST].width() - screenCoords.x;

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

@@ -2368,7 +2368,7 @@ namespace OpenRCT2::Ui::Windows
{
if (currentRide->lifecycleFlags & RIDE_LIFECYCLE_INDESTRUCTIBLE)
{
auto darkness = stringId == STR_WINDOW_COLOUR_2_STRINGID ? TextDarkness::ExtraDark : TextDarkness::Dark;
auto darkness = stringId == STR_WINDOW_COLOUR_2_STRINGID ? TextDarkness::extraDark : TextDarkness::dark;
DrawText(
rt, { 2, y }, { colours[1].withFlag(ColourFlag::translucent, false), FontStyle::Medium, darkness },
kCheckMarkString);

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

@@ -599,7 +599,7 @@ namespace OpenRCT2::Ui::Windows
ft.Add<const char*>(scenario->Name.c_str());
auto colour = isDisabled ? colours[1].withFlag(ColourFlag::inset, true)
: ColourWithFlags{ COLOUR_BLACK };
auto darkness = isDisabled ? TextDarkness::Dark : TextDarkness::Regular;
auto darkness = isDisabled ? TextDarkness::dark : TextDarkness::regular;
const auto scrollCentre = widgets[WIDX_SCENARIOLIST].width() / 2;
DrawTextBasic(

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

@@ -802,7 +802,7 @@ namespace OpenRCT2::Ui::Windows
if (colour.hasFlag(ColourFlag::translucent))
{
DrawText(
rt, topLeft, { colours[1].colour, FontStyle::Medium, TextDarkness::Dark }, kCheckMarkString);
rt, topLeft, { colours[1].colour, FontStyle::Medium, TextDarkness::dark }, kCheckMarkString);
}
}
}

4
src/openrct2/drawing/Drawing.String.cpp
View File

@@ -825,11 +825,11 @@ void TTFDrawString(
info.flags |= TEXT_DRAW_FLAG_NO_FORMATTING;
}
if (darkness == TextDarkness::Dark)
if (darkness == TextDarkness::dark)
{
info.flags |= TEXT_DRAW_FLAG_DARK;
}
else if (darkness == TextDarkness::ExtraDark)
else if (darkness == TextDarkness::extraDark)
{
info.flags |= (TEXT_DRAW_FLAG_DARK | TEXT_DRAW_FLAG_EXTRA_DARK);
}

8
src/openrct2/drawing/Text.h
View File

@@ -36,9 +36,9 @@ enum class TextUnderline
enum class TextDarkness
{
Regular = 0,
Dark = 1,
ExtraDark = 2,
regular = 0,
dark = 1,
extraDark = 2,
};
struct TextPaint
@@ -47,7 +47,7 @@ struct TextPaint
::FontStyle FontStyle = FontStyle::Medium;
TextUnderline UnderlineText = TextUnderline::Off;
TextAlignment Alignment = TextAlignment::LEFT;
TextDarkness Darkness = TextDarkness::Regular;
TextDarkness Darkness = TextDarkness::regular;
TextPaint() = default;
TextPaint(ColourWithFlags colour)