diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 56f9a2865a..d02992abdd 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -208,7 +208,6 @@ C666ED771F33DBB20061AA04 /* ShortcutKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666ED751F33DBB20061AA04 /* ShortcutKeys.cpp */; }; C666EE0B1F33E3650061AA04 /* _legacy.c in Sources */ = {isa = PBXBuildFile; fileRef = C666ED791F33E3520061AA04 /* _legacy.c */; }; C666EE141F33E3800061AA04 /* Dropdown.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666ED821F33E3520061AA04 /* Dropdown.cpp */; }; - C666EE161F33E3800061AA04 /* EditorBottomToolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666ED831F33E3520061AA04 /* EditorBottomToolbar.cpp */; }; C666EE181F33E3800061AA04 /* EditorMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666ED851F33E3520061AA04 /* EditorMain.cpp */; }; C666EE1A1F33E3800061AA04 /* EditorObjectSelection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666ED871F33E3520061AA04 /* EditorObjectSelection.cpp */; }; C666EE451F33E3800061AA04 /* TileInspector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EDB21F33E3520061AA04 /* TileInspector.cpp */; }; @@ -234,6 +233,7 @@ C666EE7D1F37ACB10061AA04 /* TitleMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE671F37ACB10061AA04 /* TitleMenu.cpp */; }; C666EE7E1F37ACB10061AA04 /* TitleOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE681F37ACB10061AA04 /* TitleOptions.cpp */; }; C666EE7F1F37ACB10061AA04 /* Viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C666EE691F37ACB10061AA04 /* Viewport.cpp */; }; + C67CCD661FBBCFDB004FAE4C /* EditorBottomToolbar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C67CCD651FBBCFDB004FAE4C /* EditorBottomToolbar.cpp */; }; C685E5191F8907850090598F /* NewRide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C685E5141F8907840090598F /* NewRide.cpp */; }; C685E51A1F8907850090598F /* Staff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C685E5151F8907840090598F /* Staff.cpp */; }; C685E51B1F8907850090598F /* Guest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C685E5161F8907840090598F /* Guest.cpp */; }; @@ -824,7 +824,6 @@ C666ED781F33E3520061AA04 /* _legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _legacy.h; sourceTree = ""; }; C666ED791F33E3520061AA04 /* _legacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = _legacy.c; sourceTree = ""; }; C666ED821F33E3520061AA04 /* Dropdown.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Dropdown.cpp; sourceTree = ""; }; - C666ED831F33E3520061AA04 /* EditorBottomToolbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorBottomToolbar.cpp; sourceTree = ""; }; C666ED851F33E3520061AA04 /* EditorMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorMain.cpp; sourceTree = ""; }; C666ED871F33E3520061AA04 /* EditorObjectSelection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorObjectSelection.cpp; sourceTree = ""; }; C666EDB21F33E3520061AA04 /* TileInspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TileInspector.cpp; sourceTree = ""; }; @@ -851,6 +850,7 @@ C666EE681F37ACB10061AA04 /* TitleOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TitleOptions.cpp; sourceTree = ""; }; C666EE691F37ACB10061AA04 /* Viewport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Viewport.cpp; sourceTree = ""; }; C666EE6A1F37ACB10061AA04 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = ""; }; + C67CCD651FBBCFDB004FAE4C /* EditorBottomToolbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EditorBottomToolbar.cpp; sourceTree = ""; }; C685E5141F8907840090598F /* NewRide.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NewRide.cpp; sourceTree = ""; }; C685E5151F8907840090598F /* Staff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Staff.cpp; sourceTree = ""; }; C685E5161F8907840090598F /* Guest.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Guest.cpp; sourceTree = ""; }; @@ -2521,7 +2521,6 @@ C666ED781F33E3520061AA04 /* _legacy.h */, C666ED821F33E3520061AA04 /* Dropdown.cpp */, F76C85171EC4E7CD00FA49E2 /* dropdown.h */, - C666ED831F33E3520061AA04 /* EditorBottomToolbar.cpp */, C666ED851F33E3520061AA04 /* EditorMain.cpp */, C666ED871F33E3520061AA04 /* EditorObjectSelection.cpp */, C654DF3E1F69C18C0040F43D /* Intent.cpp */, @@ -2686,6 +2685,7 @@ C666EE581F37ACB10061AA04 /* CustomCurrency.cpp */, C666EE591F37ACB10061AA04 /* DebugPaint.cpp */, C654DF1D1F69C0430040F43D /* DemolishRidePrompt.cpp */, + C67CCD651FBBCFDB004FAE4C /* EditorBottomToolbar.cpp */, C64644EF1F3FA4120026AC2D /* EditorInventionsList.cpp */, C64644F01F3FA4120026AC2D /* EditorObjectiveOptions.cpp */, C64644F11F3FA4120026AC2D /* EditorScenarioOptions.cpp */, @@ -3258,6 +3258,7 @@ F76C88811EC5324E00FA49E2 /* DrawLineShader.cpp in Sources */, 4C93F13A1F8B744400A9330D /* AirPoweredVerticalCoaster.cpp in Sources */, 4C93F1421F8B744400A9330D /* InvertedHairpinCoaster.cpp in Sources */, + C67CCD661FBBCFDB004FAE4C /* EditorBottomToolbar.cpp in Sources */, C666EE731F37ACB10061AA04 /* MusicCredits.cpp in Sources */, 4C93F1511F8B744400A9330D /* StandUpRollerCoaster.cpp in Sources */, 4C93F18C1F8B747A00A9330D /* LaunchedFreefall.cpp in Sources */, @@ -3482,7 +3483,6 @@ F76C86FC1EC4E88400FA49E2 /* ride.c in Sources */, F76C86FE1EC4E88400FA49E2 /* ride_data.c in Sources */, F76C87001EC4E88400FA49E2 /* ride_ratings.c in Sources */, - C666EE161F33E3800061AA04 /* EditorBottomToolbar.cpp in Sources */, C666EE4D1F33E3800061AA04 /* Tooltip.cpp in Sources */, F76C87191EC4E88400FA49E2 /* track_design_save.c in Sources */, F76C871A1EC4E88400FA49E2 /* track_paint.c in Sources */, diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 552ff15620..6cb51fa363 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -156,6 +156,8 @@ public: return window_maze_construction_open(); case WV_NETWORK_PASSWORD: return window_network_status_open_password(); + case WV_EDITOR_BOTTOM_TOOLBAR: + return window_editor_bottom_toolbar_open(); default: return nullptr; } diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index c168ac6073..df37ac1921 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -264,7 +264,7 @@ static void shortcut_remove_top_bottom_toolbar_toggle() else { context_open_window(WC_TOP_TOOLBAR); - window_editor_bottom_toolbar_open(); + context_open_window_view(WV_EDITOR_BOTTOM_TOOLBAR); } } } diff --git a/src/openrct2/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp similarity index 97% rename from src/openrct2/windows/EditorBottomToolbar.cpp rename to src/openrct2-ui/windows/EditorBottomToolbar.cpp index 43a30b2a34..66b689beca 100644 --- a/src/openrct2/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -14,21 +14,22 @@ *****************************************************************************/ #pragma endregion +#include + #include -#include "../Context.h" -#include "../OpenRCT2.h" - -#include "../audio/audio.h" -#include "../game.h" -#include "../Editor.h" -#include "../input.h" -#include "../sprites.h" -#include "../localisation/localisation.h" -#include "../interface/themes.h" -#include "../interface/widget.h" -#include "../windows/Intent.h" -#include "../world/scenery.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include enum { WIDX_PREVIOUS_IMAGE, // 1 @@ -128,7 +129,7 @@ static const rct_string_id EditorStepNames[] = { * Creates the main editor top toolbar window. * rct2: 0x0066F052 (part of 0x0066EF38) */ -void window_editor_bottom_toolbar_open() +rct_window * window_editor_bottom_toolbar_open() { rct_window * window = window_create(0, context_get_height() - 32, context_get_width(), 32, @@ -144,6 +145,8 @@ void window_editor_bottom_toolbar_open() window_init_scroll_widgets(window); reset_researched_scenery_items(); + + return window; } /** diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index ed64c8de9b..ff7230430c 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -149,3 +149,5 @@ void window_scenery_reset_selected_scenery_items(); rct_window * window_game_bottom_toolbar_open(); void window_game_bottom_toolbar_invalidate_news_item(); + +rct_window * window_editor_bottom_toolbar_open(); diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index 986d840e4f..f1b0b0e43a 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -509,6 +509,7 @@ enum { WV_RIDE_RESEARCH, WV_MAZE_CONSTRUCTION, WV_NETWORK_PASSWORD, + WV_EDITOR_BOTTOM_TOOLBAR, }; enum { @@ -722,7 +723,6 @@ void window_tile_inspector_open(); void window_tile_inspector_clear_clipboard(); rct_window * window_editor_main_open(); -void window_editor_bottom_toolbar_open(); void window_editor_object_selection_open(); void window_bubble_list_item(rct_window* w, sint32 item_position); diff --git a/src/openrct2/windows/EditorMain.cpp b/src/openrct2/windows/EditorMain.cpp index b092d1a60d..75f53933e0 100644 --- a/src/openrct2/windows/EditorMain.cpp +++ b/src/openrct2/windows/EditorMain.cpp @@ -81,7 +81,7 @@ rct_window * window_editor_main_open() gFootpathSelectedType = 0; context_open_window(WC_TOP_TOOLBAR); - window_editor_bottom_toolbar_open(); + context_open_window_view(WV_EDITOR_BOTTOM_TOOLBAR); return window_get_main(); }