Skip to content

Commit

Permalink
Turn Rotate View dropdown into two buttons
Browse files Browse the repository at this point in the history 
Co-authored-by: MasterTomNL <tomvanderlek@gmail.com>
  • Loading branch information
@Gymnasiast @MasterTomNL
Gymnasiast and MasterTomNL committed Jan 27, 2025
1 parent b850bf8 commit f6e5cc1
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 60 deletions.
1 change: 1 addition & 0 deletions data/language/en-GB.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3794,3 +3794,4 @@ STR_6728 :Dive Loop (right)
STR_6729 :Cable lift hill must start immediately after station or block brake
STR_6730 :Export emscripten data
STR_6731 :Import emscripten data
STR_6732 :Show a button in the toolbar to rotate the view anti-clockwise
Binary file added resources/g2/icons/rotate_view_anti-clockwise.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions resources/g2/sprites.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39920,5 +39920,8 @@
"x": -32,
"y": 15,
"palette": "keep"
},
{
"path": "icons/rotate_view_anti-clockwise.png"
}
]
1 change: 1 addition & 0 deletions src/openrct2-ui/UiStringIds.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1192,6 +1192,7 @@ namespace OpenRCT2
STR_RIDE_MUSIC = 1777,
STR_RIDE_MUSIC_TIP = 5854,
STR_ROLLERCOASTER_TYCOON_1_DROPDOWN = 2740,
STR_ROTATE_VIEW_ANTI_CLOCKWISE_IN_TOOLBAR_TIP = 6732,
STR_SAVE_EVERY_15MINUTES = 2703,
STR_SAVE_EVERY_30MINUTES = 2704,
STR_SAVE_EVERY_5MINUTES = 2702,
Expand Down
26 changes: 16 additions & 10 deletions src/openrct2-ui/windows/Options.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ namespace OpenRCT2::Ui::Windows
WIDX_TOOLBAR_SHOW_MUTE,
WIDX_TOOLBAR_SHOW_CHAT,
WIDX_TOOLBAR_SHOW_ZOOM,
WIDX_TOOLBAR_SHOW_ROTATE_ANTI_CLOCKWISE,

// Misc
WIDX_TITLE_SEQUENCE_GROUP = WIDX_PAGE_START,
Expand Down Expand Up @@ -353,16 +354,17 @@ namespace OpenRCT2::Ui::Windows
MakeWidget({288, kThemesGroupStart + 15}, { 11, 10}, WindowWidgetType::Button, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_CURRENT_THEME_TIP ),
MakeWidget({155, kThemesGroupStart + 30}, {145, 13}, WindowWidgetType::Button, WindowColour::Secondary, STR_EDIT_THEMES_BUTTON, STR_EDIT_THEMES_BUTTON_TIP), // Themes button

MakeWidget({ 5, kToolbarGroupStart + 0}, {300,107}, WindowWidgetType::Groupbox, WindowColour::Secondary, STR_TOOLBAR_BUTTONS_GROUP ), // Toolbar buttons group
MakeWidget({ 10, kToolbarGroupStart + 14}, {280, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary, STR_OPTIONS_TOOLBAR_BUTTONS_CENTRED, STR_OPTIONS_TOOLBAR_BUTTONS_CENTRED_TIP),
MakeWidget({ 10, kToolbarGroupStart + 31}, {280, 12}, WindowWidgetType::Label, WindowColour::Secondary, STR_SHOW_TOOLBAR_BUTTONS_FOR ),
MakeWidget({ 24, kToolbarGroupStart + 46}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_FINANCES_BUTTON_ON_TOOLBAR, STR_FINANCES_BUTTON_ON_TOOLBAR_TIP ), // Finances
MakeWidget({ 24, kToolbarGroupStart + 61}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_RESEARCH_BUTTON_ON_TOOLBAR, STR_RESEARCH_BUTTON_ON_TOOLBAR_TIP ), // Research
MakeWidget({155, kToolbarGroupStart + 46}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_CHEATS_BUTTON_ON_TOOLBAR, STR_CHEATS_BUTTON_ON_TOOLBAR_TIP ), // Cheats
MakeWidget({155, kToolbarGroupStart + 61}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR_TIP), // Recent messages
MakeWidget({ 24, kToolbarGroupStart + 76}, {162, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP ), // Mute
MakeWidget({155, kToolbarGroupStart + 76}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_CHAT_BUTTON_ON_TOOLBAR, STR_CHAT_BUTTON_ON_TOOLBAR_TIP ), // Chat
MakeWidget({ 24, kToolbarGroupStart + 91}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_ZOOM_BUTTON_ON_TOOLBAR, STR_ZOOM_BUTTON_ON_TOOLBAR_TIP ), // Zoom
MakeWidget({ 5, kToolbarGroupStart + 0}, {300,107}, WindowWidgetType::Groupbox, WindowColour::Secondary, STR_TOOLBAR_BUTTONS_GROUP ), // Toolbar buttons group
MakeWidget({ 10, kToolbarGroupStart + 14}, {280, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary, STR_OPTIONS_TOOLBAR_BUTTONS_CENTRED, STR_OPTIONS_TOOLBAR_BUTTONS_CENTRED_TIP ),
MakeWidget({ 10, kToolbarGroupStart + 31}, {280, 12}, WindowWidgetType::Label, WindowColour::Secondary, STR_SHOW_TOOLBAR_BUTTONS_FOR ),
MakeWidget({ 24, kToolbarGroupStart + 46}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_FINANCES_BUTTON_ON_TOOLBAR, STR_FINANCES_BUTTON_ON_TOOLBAR_TIP ), // Finances
MakeWidget({ 24, kToolbarGroupStart + 61}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_RESEARCH_BUTTON_ON_TOOLBAR, STR_RESEARCH_BUTTON_ON_TOOLBAR_TIP ), // Research
MakeWidget({155, kToolbarGroupStart + 46}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_CHEATS_BUTTON_ON_TOOLBAR, STR_CHEATS_BUTTON_ON_TOOLBAR_TIP ), // Cheats
MakeWidget({155, kToolbarGroupStart + 61}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR_TIP ), // Recent messages
MakeWidget({ 24, kToolbarGroupStart + 76}, {162, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP ), // Mute
MakeWidget({155, kToolbarGroupStart + 76}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_CHAT_BUTTON_ON_TOOLBAR, STR_CHAT_BUTTON_ON_TOOLBAR_TIP ), // Chat
MakeWidget({ 24, kToolbarGroupStart + 91}, {122, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_ZOOM_BUTTON_ON_TOOLBAR, STR_ZOOM_BUTTON_ON_TOOLBAR_TIP ), // Zoom
MakeWidget({155, kToolbarGroupStart + 91}, {145, 12}, WindowWidgetType::Checkbox, WindowColour::Tertiary , STR_ROTATE_ANTI_CLOCKWISE, STR_ROTATE_VIEW_ANTI_CLOCKWISE_IN_TOOLBAR_TIP), // Rotate anti-clockwise
};

constexpr int32_t kTitleSequenceStart = 53;
Expand Down Expand Up @@ -1600,6 +1602,9 @@ namespace OpenRCT2::Ui::Windows
case WIDX_TOOLBAR_SHOW_ZOOM:
ToggleToolbarSetting(Config::Get().interface.ToolbarShowZoom);
break;
case WIDX_TOOLBAR_SHOW_ROTATE_ANTI_CLOCKWISE:
ToggleToolbarSetting(Config::Get().interface.ToolbarShowRotateAnticlockwise);
break;
case WIDX_WINDOW_BUTTONS_ON_THE_LEFT:
Config::Get().interface.WindowButtonsOnTheLeft ^= 1;
Config::Save();
Expand Down Expand Up @@ -1685,6 +1690,7 @@ namespace OpenRCT2::Ui::Windows
SetCheckboxValue(WIDX_TOOLBAR_SHOW_MUTE, Config::Get().interface.ToolbarShowMute);
SetCheckboxValue(WIDX_TOOLBAR_SHOW_CHAT, Config::Get().interface.ToolbarShowChat);
SetCheckboxValue(WIDX_TOOLBAR_SHOW_ZOOM, Config::Get().interface.ToolbarShowZoom);
SetCheckboxValue(WIDX_TOOLBAR_SHOW_ROTATE_ANTI_CLOCKWISE, Config::Get().interface.ToolbarShowRotateAnticlockwise);
SetCheckboxValue(WIDX_WINDOW_BUTTONS_ON_THE_LEFT, Config::Get().interface.WindowButtonsOnTheLeft);
SetCheckboxValue(WIDX_ENLARGED_UI, Config::Get().interface.EnlargedUi);
SetCheckboxValue(WIDX_TOUCH_ENHANCEMENTS, Config::Get().interface.TouchEnhancements);
Expand Down
88 changes: 39 additions & 49 deletions src/openrct2-ui/windows/TopToolbar.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ namespace OpenRCT2::Ui::Windows
WIDX_MUTE,
WIDX_ZOOM_OUT,
WIDX_ZOOM_IN,
WIDX_ROTATE,
WIDX_ROTATE_ANTI_CLOCKWISE,
WIDX_ROTATE_CLOCKWISE,
WIDX_VIEW_MENU,
WIDX_MAP,

Expand Down Expand Up @@ -196,7 +197,8 @@ namespace OpenRCT2::Ui::Windows

WIDX_ZOOM_OUT,
WIDX_ZOOM_IN,
WIDX_ROTATE,
WIDX_ROTATE_ANTI_CLOCKWISE,
WIDX_ROTATE_CLOCKWISE,
WIDX_VIEW_MENU,
WIDX_MAP,
};
Expand Down Expand Up @@ -241,17 +243,18 @@ namespace OpenRCT2::Ui::Windows
MakeRemapWidget({250, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_G2_TOOLBAR_MUTE, STR_TOOLBAR_MUTE_TIP ), // Mute
MakeRemapWidget({100, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // Zoom out
MakeRemapWidget({130, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP ), // Zoom in
MakeRemapWidget({160, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_ROTATE, STR_ROTATE_TIP ), // Rotate camera
MakeRemapWidget({190, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP ), // Transparency menu
MakeRemapWidget({220, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP ), // Map
MakeRemapWidget({267, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP ), // Land
MakeRemapWidget({297, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP ), // Water
MakeRemapWidget({327, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP ), // Scenery
MakeRemapWidget({357, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP ), // Path
MakeRemapWidget({387, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP ), // Construct ride
MakeRemapWidget({490, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP ), // Rides
MakeRemapWidget({520, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP ), // Park
MakeRemapWidget({550, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_STAFF_TIP ), // Staff
MakeRemapWidget({190, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TAB_TOOLBAR, STR_ROTATE_ANTI_CLOCKWISE ), // Rotate camera anti-clockwise
MakeRemapWidget({160, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_ROTATE, STR_ROTATE_CLOCKWISE ), // Rotate camera clockwise
MakeRemapWidget({220, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP ), // Transparency menu
MakeRemapWidget({267, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Secondary , SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP ), // Map
MakeRemapWidget({297, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP ), // Land
MakeRemapWidget({327, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP ), // Water
MakeRemapWidget({357, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP ), // Scenery
MakeRemapWidget({387, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP ), // Path
MakeRemapWidget({490, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP ), // Construct ride
MakeRemapWidget({520, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP ), // Rides
MakeRemapWidget({550, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP ), // Park
MakeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_STAFF_TIP ), // Staff
MakeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Quaternary, SPR_TOOLBAR_GUESTS, STR_GUESTS_TIP ), // Guests
MakeRemapWidget({560, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Tertiary , SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP ), // Clear scenery
MakeRemapWidget({ 30, 0}, {30, kTopToolbarHeight + 1}, WindowWidgetType::TrnBtn, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_GAME_SPEED_TIP ), // Fast forward
Expand Down Expand Up @@ -283,10 +286,6 @@ namespace OpenRCT2::Ui::Windows

void FastforwardMenuDropdown(int16_t dropdownIndex);

void InitRotateMenu(Widget& widget);

void RotateMenuDropdown(int16_t dropdownIndex);

void InitFileMenu(Widget& widget);

void InitCheatsMenu(Widget& widget);
Expand Down Expand Up @@ -324,6 +323,12 @@ namespace OpenRCT2::Ui::Windows
if ((mainWindow = WindowGetMain()) != nullptr)
WindowZoomIn(*mainWindow, false);
break;
case WIDX_ROTATE_CLOCKWISE:
ViewportRotateAll(1);
break;
case WIDX_ROTATE_ANTI_CLOCKWISE:
ViewportRotateAll(-1);
break;
case WIDX_CLEAR_SCENERY:
ToggleClearSceneryWindow();
break;
Expand Down Expand Up @@ -400,9 +405,6 @@ namespace OpenRCT2::Ui::Windows
case WIDX_FASTFORWARD:
InitFastforwardMenu(widget);
break;
case WIDX_ROTATE:
InitRotateMenu(widget);
break;
case WIDX_DEBUG:
InitDebugMenu(widget);
break;
Expand Down Expand Up @@ -525,9 +527,6 @@ namespace OpenRCT2::Ui::Windows
case WIDX_FASTFORWARD:
FastforwardMenuDropdown(selectedIndex);
break;
case WIDX_ROTATE:
RotateMenuDropdown(selectedIndex);
break;
case WIDX_DEBUG:
DebugMenuDropdown(selectedIndex);
break;
Expand Down Expand Up @@ -594,7 +593,8 @@ namespace OpenRCT2::Ui::Windows
widgets[WIDX_FILE_MENU].type = WindowWidgetType::TrnBtn;
widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::TrnBtn;
widgets[WIDX_ZOOM_IN].type = WindowWidgetType::TrnBtn;
widgets[WIDX_ROTATE].type = WindowWidgetType::TrnBtn;
widgets[WIDX_ROTATE_CLOCKWISE].type = WindowWidgetType::TrnBtn;
widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WindowWidgetType::TrnBtn;
widgets[WIDX_VIEW_MENU].type = WindowWidgetType::TrnBtn;
widgets[WIDX_MAP].type = WindowWidgetType::TrnBtn;
widgets[WIDX_MUTE].type = WindowWidgetType::TrnBtn;
Expand Down Expand Up @@ -642,6 +642,9 @@ namespace OpenRCT2::Ui::Windows
widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::Empty;
}

if (!Config::Get().interface.ToolbarShowRotateAnticlockwise)
widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WindowWidgetType::Empty;

if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR || gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)
{
widgets[WIDX_PAUSE].type = WindowWidgetType::Empty;
Expand Down Expand Up @@ -690,7 +693,8 @@ namespace OpenRCT2::Ui::Windows

widgets[WIDX_ZOOM_OUT].type = WindowWidgetType::Empty;
widgets[WIDX_ZOOM_IN].type = WindowWidgetType::Empty;
widgets[WIDX_ROTATE].type = WindowWidgetType::Empty;
widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type = WindowWidgetType::Empty;
widgets[WIDX_ROTATE_CLOCKWISE].type = WindowWidgetType::Empty;
widgets[WIDX_VIEW_MENU].type = WindowWidgetType::Empty;
}
}
Expand Down Expand Up @@ -989,6 +993,16 @@ namespace OpenRCT2::Ui::Windows
auto colour = ColourWithFlags{ COLOUR_WHITE }.withFlag(ColourFlag::withOutline, true);
DrawTextBasic(dpi, screenPos + ScreenCoordsXY{ 23, 1 }, STR_COMMA16, ft, { colour, TextAlignment::RIGHT });
}

if (widgets[WIDX_ROTATE_ANTI_CLOCKWISE].type != WindowWidgetType::Empty)
{
screenPos = windowPos
+ ScreenCoordsXY{ widgets[WIDX_ROTATE_ANTI_CLOCKWISE].left + 2,
widgets[WIDX_ROTATE_ANTI_CLOCKWISE].top + 0 };
if (IsWidgetPressed(WIDX_ROTATE_ANTI_CLOCKWISE))
screenPos.y++;
GfxDrawSprite(dpi, ImageId(SPR_G2_ICON_ROTATE_ANTI_CLOCKWISE), screenPos);
}
}
};

Expand Down Expand Up @@ -1310,30 +1324,6 @@ namespace OpenRCT2::Ui::Windows
}
}

void TopToolbar::InitRotateMenu(Widget& widget)
{
gDropdownItems[0].Format = STR_ROTATE_CLOCKWISE;
gDropdownItems[1].Format = STR_ROTATE_ANTI_CLOCKWISE;

WindowDropdownShowText(
{ windowPos.x + widget.left, windowPos.y + widget.top }, widget.height() + 1,
colours[1].withFlag(ColourFlag::translucent, true), 0, 2);

gDropdownDefaultIndex = DDIDX_ROTATE_CLOCKWISE;
}

void TopToolbar::RotateMenuDropdown(int16_t dropdownIndex)
{
if (dropdownIndex == 0)
{
ViewportRotateAll(1);
}
else if (dropdownIndex == 1)
{
ViewportRotateAll(-1);
}
}

void TopToolbar::InitFileMenu(Widget& widget)
{
int32_t numItems = 0;
Expand Down
2 changes: 2 additions & 0 deletions src/openrct2/config/Config.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ namespace OpenRCT2::Config
model->ToolbarShowMute = reader->GetBoolean("toolbar_show_mute", false);
model->ToolbarShowChat = reader->GetBoolean("toolbar_show_chat", false);
model->ToolbarShowZoom = reader->GetBoolean("toolbar_show_zoom", true);
model->ToolbarShowRotateAnticlockwise = reader->GetBoolean("toolbar_show_rotate_anti_clockwise", false);
model->ConsoleSmallFont = reader->GetBoolean("console_small_font", false);
model->CurrentThemePreset = reader->GetString("current_theme", "*RCT2");
model->CurrentTitleSequencePreset = reader->GetString("current_title_sequence", "*OPENRCT2");
Expand All @@ -388,6 +389,7 @@ namespace OpenRCT2::Config
writer->WriteBoolean("toolbar_show_mute", model->ToolbarShowMute);
writer->WriteBoolean("toolbar_show_chat", model->ToolbarShowChat);
writer->WriteBoolean("toolbar_show_zoom", model->ToolbarShowZoom);
writer->WriteBoolean("toolbar_show_rotate_anti_clockwise", model->ToolbarShowRotateAnticlockwise);
writer->WriteBoolean("console_small_font", model->ConsoleSmallFont);
writer->WriteString("current_theme", model->CurrentThemePreset);
writer->WriteString("current_title_sequence", model->CurrentTitleSequencePreset);
Expand Down
1 change: 1 addition & 0 deletions src/openrct2/config/Config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ namespace OpenRCT2::Config
bool ToolbarShowMute;
bool ToolbarShowChat;
bool ToolbarShowZoom;
bool ToolbarShowRotateAnticlockwise;
bool ConsoleSmallFont;
bool RandomTitleSequence;
u8string CurrentThemePreset;
Expand Down
Loading

0 comments on commit f6e5cc1

Please sign in to comment.