diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 72c7747b02..572255e47a 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -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); } diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index a44b487dd8..e14a563019 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -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; diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 3b9bcc7d5f..bb38fe3a8a 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -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); diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index 5b57220234..593805142a 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -599,7 +599,7 @@ namespace OpenRCT2::Ui::Windows ft.Add(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( diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 8321fc1b1b..f9554ac562 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -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); } } } diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp index 5a48d8318a..4bb416efa2 100644 --- a/src/openrct2/drawing/Drawing.String.cpp +++ b/src/openrct2/drawing/Drawing.String.cpp @@ -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); } diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index d3606fa906..e448dd8718 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -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)