Move editor bottom toolbar to UI module

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;
         }

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);
             }
         }
     }

src/openrct2-ui/windows/EditorBottomToolbar.cpp

@@ -14,21 +14,22 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <openrct2-ui/windows/Window.h>
+
 #include <string>
 
-#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 <openrct2/Context.h>
+#include <openrct2/OpenRCT2.h>
+#include <openrct2/audio/audio.h>
+#include <openrct2/game.h>
+#include <openrct2/Editor.h>
+#include <openrct2/input.h>
+#include <openrct2/sprites.h>
+#include <openrct2/localisation/localisation.h>
+#include <openrct2/interface/themes.h>
+#include <openrct2/interface/widget.h>
+#include <openrct2/windows/Intent.h>
+#include <openrct2/world/scenery.h>
 
 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;
 }
 
 /**

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();

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);

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();
 }