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

Fix: Shortcut Keys window uses wrong colours for separators, scrollbars and buttons

Browse Source
This commit is contained in:
Michael Steenbeek
2025-10-20 22:52:33 +02:00
committed by GitHub
parent 6f58c2e7d0
commit df1da08548
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -22,6 +22,7 @@
- Fix: [#25370] The Hybrid Coaster diagonal brakes and block brakes do not block metal supports consistently. - Fix: [#25370] The Hybrid Coaster diagonal brakes and block brakes do not block metal supports consistently.
- Fix: [#25371] The Wooden Roller Coaster small banked turns block too many metal supports. - Fix: [#25371] The Wooden Roller Coaster small banked turns block too many metal supports.
- Fix: [#25378] The land tool sometimes allows land to be raised through a maze. - Fix: [#25378] The land tool sometimes allows land to be raised through a maze.
- Fix: [#25388] The Shortcut Keys window uses the wrong colours for separators, scrollbars and buttons.
0.4.27 (2025-10-04) 0.4.27 (2025-10-04)
------------------------------------------------------------------------ ------------------------------------------------------------------------

2
src/openrct2-ui/interface/Theme.cpp
View File

@@ -186,7 +186,7 @@ namespace OpenRCT2::Ui
{ WindowClass::trackDesignList, "WC_TRACK_DESIGN_LIST", STR_THEMES_WINDOW_TRACK_DESIGN_LIST, { opaque(COLOUR_BORDEAUX_RED), opaque(COLOUR_BORDEAUX_RED), opaque(COLOUR_BORDEAUX_RED) } }, { WindowClass::trackDesignList, "WC_TRACK_DESIGN_LIST", STR_THEMES_WINDOW_TRACK_DESIGN_LIST, { opaque(COLOUR_BORDEAUX_RED), opaque(COLOUR_BORDEAUX_RED), opaque(COLOUR_BORDEAUX_RED) } },
{ WindowClass::trackDesignPlace, "WC_TRACK_DESIGN_PLACE", STR_THEMES_WINDOW_TRACK_DESIGN_PLACE, { opaque(COLOUR_DARK_BROWN), opaque(COLOUR_DARK_BROWN), opaque(COLOUR_DARK_BROWN) } }, { WindowClass::trackDesignPlace, "WC_TRACK_DESIGN_PLACE", STR_THEMES_WINDOW_TRACK_DESIGN_PLACE, { opaque(COLOUR_DARK_BROWN), opaque(COLOUR_DARK_BROWN), opaque(COLOUR_DARK_BROWN) } },
{ WindowClass::newCampaign, "WC_NEW_CAMPAIGN", STR_THEMES_WINDOW_NEW_CAMPAIGN, { opaque(COLOUR_DARK_YELLOW), opaque(COLOUR_DARK_YELLOW), opaque(COLOUR_DARK_YELLOW) } }, { WindowClass::newCampaign, "WC_NEW_CAMPAIGN", STR_THEMES_WINDOW_NEW_CAMPAIGN, { opaque(COLOUR_DARK_YELLOW), opaque(COLOUR_DARK_YELLOW), opaque(COLOUR_DARK_YELLOW) } },
{ WindowClass::keyboardShortcutList, "WC_KEYBOARD_SHORTCUT_LIST", STR_THEMES_WINDOW_KEYBOARD_SHORTCUT_LIST, { opaque(COLOUR_LIGHT_BLUE), opaque(COLOUR_LIGHT_BLUE), opaque(COLOUR_LIGHT_BLUE) } }, { WindowClass::keyboardShortcutList, "WC_KEYBOARD_SHORTCUT_LIST", STR_THEMES_WINDOW_KEYBOARD_SHORTCUT_LIST, { opaque(COLOUR_LIGHT_BLUE), opaque(COLOUR_LIGHT_BLUE) } },
{ WindowClass::changeKeyboardShortcut, "WC_CHANGE_KEYBOARD_SHORTCUT", STR_THEMES_WINDOW_CHANGE_KEYBOARD_SHORTCUT, { opaque(COLOUR_LIGHT_BLUE), opaque(COLOUR_LIGHT_BLUE), opaque(COLOUR_LIGHT_BLUE) } }, { WindowClass::changeKeyboardShortcut, "WC_CHANGE_KEYBOARD_SHORTCUT", STR_THEMES_WINDOW_CHANGE_KEYBOARD_SHORTCUT, { opaque(COLOUR_LIGHT_BLUE), opaque(COLOUR_LIGHT_BLUE), opaque(COLOUR_LIGHT_BLUE) } },
{ WindowClass::resetShortcutKeysPrompt, "WC_RESET_SHORTCUT_KEYS_PROMPT", STR_SHORTCUT_ACTION_RESET, { translucent(COLOUR_BORDEAUX_RED) } }, { WindowClass::resetShortcutKeysPrompt, "WC_RESET_SHORTCUT_KEYS_PROMPT", STR_SHORTCUT_ACTION_RESET, { translucent(COLOUR_BORDEAUX_RED) } },
{ WindowClass::map, "WC_MAP", STR_THEMES_WINDOW_MAP, { opaque(COLOUR_DARK_GREEN), opaque(COLOUR_DARK_BROWN) } }, { WindowClass::map, "WC_MAP", STR_THEMES_WINDOW_MAP, { opaque(COLOUR_DARK_GREEN), opaque(COLOUR_DARK_BROWN) } },

8
src/openrct2-ui/windows/ShortcutKeys.cpp
View File

@@ -42,8 +42,8 @@ namespace OpenRCT2::Ui::Windows
static constexpr auto _shortcutWidgets = makeWidgets( static constexpr auto _shortcutWidgets = makeWidgets(
makeWindowShim(kWindowTitle, kWindowSize), makeWindowShim(kWindowTitle, kWindowSize),
makeWidget({0, 43}, {350, 287}, WidgetType::resize, WindowColour::secondary ), makeWidget({0, 43}, {350, 287}, WidgetType::resize, WindowColour::secondary ),
makeWidget({4, 47}, {412, 215}, WidgetType::scroll, WindowColour::primary, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ), makeWidget({4, 47}, {412, 215}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ),
makeWidget({4, kWindowSize.height - 15}, {150, 12}, WidgetType::button, WindowColour::primary, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP) makeWidget({4, kWindowSize.height - 15}, {150, 12}, WidgetType::button, WindowColour::secondary, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP)
); );
// clang-format on // clang-format on
@@ -501,8 +501,8 @@ namespace OpenRCT2::Ui::Windows
void DrawSeparator(RenderTarget& rt, int32_t y, int32_t scrollWidth) void DrawSeparator(RenderTarget& rt, int32_t y, int32_t scrollWidth)
{ {
const int32_t top = y + (kScrollableRowHeight / 2) - 1; const int32_t top = y + (kScrollableRowHeight / 2) - 1;
GfxFillRect(rt, { { 0, top }, { scrollWidth, top } }, ColourMapA[colours[0].colour].mid_dark); GfxFillRect(rt, { { 0, top }, { scrollWidth, top } }, ColourMapA[colours[1].colour].mid_dark);
GfxFillRect(rt, { { 0, top + 1 }, { scrollWidth, top + 1 } }, ColourMapA[colours[0].colour].lightest); GfxFillRect(rt, { { 0, top + 1 }, { scrollWidth, top + 1 } }, ColourMapA[colours[1].colour].lightest);
} }
void DrawItem(RenderTarget& rt, int32_t y, int32_t scrollWidth, const ShortcutStringPair& shortcut, bool isHighlighted) void DrawItem(RenderTarget& rt, int32_t y, int32_t scrollWidth, const ShortcutStringPair& shortcut, bool isHighlighted)