From 1e946fc0fea9eaacbcbf4f2cf281bfcd761c9a67 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 7 Dec 2017 22:33:11 +0100 Subject: [PATCH] Move Dropdown to UI project --- src/openrct2-ui/input/MouseInput.cpp | 2 +- .../interface/Dropdown.h} | 17 +++-------------- src/openrct2-ui/interface/LandTool.cpp | 2 +- src/openrct2-ui/windows/Banner.cpp | 2 +- src/openrct2-ui/windows/Cheats.cpp | 2 +- src/openrct2-ui/windows/CustomCurrency.cpp | 2 +- .../windows/Dropdown.cpp | 17 ++++++++--------- .../windows/EditorObjectSelection.cpp | 2 +- .../windows/EditorObjectiveOptions.cpp | 2 +- .../windows/EditorScenarioOptions.cpp | 2 +- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 2 +- src/openrct2-ui/windows/GuestList.cpp | 2 +- src/openrct2-ui/windows/Land.cpp | 2 +- src/openrct2-ui/windows/MapGen.cpp | 2 +- src/openrct2-ui/windows/Multiplayer.cpp | 2 +- src/openrct2-ui/windows/NewCampaign.cpp | 2 +- src/openrct2-ui/windows/Options.cpp | 2 +- src/openrct2-ui/windows/Park.cpp | 2 +- src/openrct2-ui/windows/Player.cpp | 2 +- src/openrct2-ui/windows/Research.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/RideList.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2-ui/windows/ServerList.cpp | 2 +- src/openrct2-ui/windows/Sign.cpp | 2 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2-ui/windows/Themes.cpp | 2 +- src/openrct2-ui/windows/TileInspector.cpp | 2 +- src/openrct2-ui/windows/TitleCommandEditor.cpp | 2 +- src/openrct2-ui/windows/TitleEditor.cpp | 2 +- src/openrct2-ui/windows/TitleMenu.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- 35 files changed, 44 insertions(+), 56 deletions(-) rename src/{openrct2/windows/dropdown.h => openrct2-ui/interface/Dropdown.h} (92%) rename src/{openrct2 => openrct2-ui}/windows/Dropdown.cpp (98%) diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index e8e2741576..8bcbe4ce6c 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/windows/dropdown.h b/src/openrct2-ui/interface/Dropdown.h similarity index 92% rename from src/openrct2/windows/dropdown.h rename to src/openrct2-ui/interface/Dropdown.h index 4dd55f03dc..703effa2f9 100644 --- a/src/openrct2/windows/dropdown.h +++ b/src/openrct2-ui/interface/Dropdown.h @@ -14,11 +14,10 @@ *****************************************************************************/ #pragma endregion -#ifndef _WINDOW_DROPDOWN_H_ -#define _WINDOW_DROPDOWN_H_ +#pragma once -#include "../common.h" -#include "../interface/window.h" +#include +#include #define DROPDOWN_SEPARATOR 0 #define DROPDOWN_FORMAT_COLOUR_PICKER 0xFFFE @@ -31,10 +30,6 @@ enum DROPDOWN_FLAG_STAY_OPEN = (1 << 7) }; -#ifdef __cplusplus -extern "C" { -#endif - extern sint32 gAppropriateImageDropdownItemsPerRow[]; extern sint32 gDropdownNumItems; @@ -57,9 +52,3 @@ void window_dropdown_close(); sint32 dropdown_index_from_point(sint32 x, sint32 y, rct_window* w); void window_dropdown_show_colour(rct_window *w, rct_widget *widget, uint8 dropdownColour, uint8 selectedColour); void window_dropdown_show_colour_available(rct_window *w, rct_widget *widget, uint8 dropdownColour, uint8 selectedColour, uint32 availableColours); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp index 4dee7a29dd..cd59edbcc7 100644 --- a/src/openrct2-ui/interface/LandTool.cpp +++ b/src/openrct2-ui/interface/LandTool.cpp @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index a93a2bf6a9..452c7e4516 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #define WW 113 diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 2b2f3b7f06..2f085dfde2 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define CHEATS_MONEY_DEFAULT MONEY(10000,00) #define CHEATS_MONEY_INCREMENT_DIV MONEY(5000,00) diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index 6c9a35fe8b..ac45bb9490 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include enum WINDOW_CUSTOM_CURRENCY_WIDGET_IDX { WIDX_BACKGROUND, diff --git a/src/openrct2/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp similarity index 98% rename from src/openrct2/windows/Dropdown.cpp rename to src/openrct2-ui/windows/Dropdown.cpp index c8558ea019..c644466a94 100644 --- a/src/openrct2/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -14,15 +14,14 @@ *****************************************************************************/ #pragma endregion -#include "../Context.h" -#include "../core/Util.hpp" -#include "../core/Math.hpp" - -#include "../Input.h" -#include "../interface/widget.h" -#include "../localisation/localisation.h" -#include "../sprites.h" -#include "dropdown.h" +#include +#include +#include +#include +#include +#include +#include +#include // The maximum number of rows to list before items overflow into new columns #define DROPDOWN_TEXT_MAX_ROWS 32 diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index df5aad1ba2..c1ac308b0f 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 8f798e527c..650b38ff44 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 3b01223592..4679537ba8 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #pragma region Widgets diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index b4a87ba828..4ea4c608e9 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include enum { WINDOW_FINANCES_PAGE_SUMMARY, diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index c92a79978c..227e8a69a7 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include enum { diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 8505350b64..3a807c02c1 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 373f56a43e..70a3256ffa 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include enum WINDOW_LAND_WIDGET_IDX { diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index d12acb78e1..47c6e55001 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index c5c4b1085c..c487be833f 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include enum { WINDOW_MULTIPLAYER_PAGE_INFORMATION, diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 1abce03451..8269ba49a3 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #define SELECTED_RIDE_UNDEFINED ((uint16)0xFFFF) diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 67ce038afe..fdcf061e10 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include enum WINDOW_OPTIONS_PAGE { WINDOW_OPTIONS_PAGE_DISPLAY, diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 0271b82977..0df807c8b6 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include enum WINDOW_PARK_PAGE { diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index ead246a1ff..ae20749aaf 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include enum WINDOW_PLAYER_PAGE { WINDOW_PLAYER_PAGE_OVERVIEW, diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 343868ebb4..dd8ec90ad7 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include enum { WINDOW_RESEARCH_PAGE_DEVELOPMENT, diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index dc9cee6d62..d0c5b0ead2 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 76c2d795d9..f003bb70d1 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index ea5dbe1845..d7fe753c97 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include enum { diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index c52e88cb99..426f4f14e7 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 1fd1f937d4..79221574c6 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define WWIDTH_MIN 500 #define WHEIGHT_MIN 300 diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 776e84343c..d93d80e45d 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #define WW 113 diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index c5614d7d0f..7b699428ff 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #define WW 190 diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 9565911968..f9d6cca466 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include enum { WINDOW_STAFF_LIST_TAB_HANDYMEN, diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 3874913a71..4aeff332f2 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 80445db7e1..962300a41b 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index dcaa568592..5f99b64ee4 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include typedef struct TITLE_COMMAND_ORDER { // originally a uint8, but the new millisecond wait times require a uint16. diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index ff1eafefe8..a11b77aabf 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include enum WINDOW_TITLE_EDITOR_TAB { WINDOW_TITLE_EDITOR_TAB_PRESETS, diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index 9b370820fb..0cb9037559 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include enum { WIDX_START_NEW_GAME, diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 49782fe7e4..569a4da143 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include