diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 5a47d072b1..88c65a9d1e 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -41,8 +41,8 @@ enum WINDOW_TEXT_INPUT_WIDGET_IDX { // 0x9DE4E0 static rct_widget window_text_input_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - { WWT_BUTTON, 1, WW - 80, WW - 10, WH - 22, WH - 9, STR_CANCEL, STR_NONE }, - { WWT_BUTTON, 1, 10, 80, WH - 22, WH - 9, STR_OK, STR_NONE }, + MakeWidget({170, 68}, {71, 14}, WWT_BUTTON, 1, STR_CANCEL), + MakeWidget({ 10, 68}, {71, 14}, WWT_BUTTON, 1, STR_OK ), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 7046728b5b..a7cec987bd 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -109,33 +109,35 @@ enum WINDOW_STAFF_LIST_WIDGET_IDX { WIDX_THEMES_RCT1_BOTTOM_TOOLBAR }; +static constexpr const rct_string_id WINDOW_TITLE = STR_THEMES_TITLE; +static constexpr const int32_t WW = 320; +static constexpr const int32_t WH = 107; + static rct_widget window_themes_widgets[] = { - { WWT_FRAME, 0, 0, 319, 0, 106, 0xFFFFFFFF, STR_NONE }, // panel / background - { WWT_CAPTION, 0, 1, 318, 1, 14, STR_THEMES_TITLE, STR_WINDOW_TITLE_TIP }, // title bar - { WWT_CLOSEBOX, 0, 307, 317, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close button - { WWT_RESIZE, 1, 0, 319, 43, 106, 0xFFFFFFFF, STR_NONE }, // tab content panel - { WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_SETTINGS_TIP }, // settings tab - { WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_MAIN_TIP }, // main ui tab - { WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_PARK_TIP }, // park tab - { WWT_TAB, 1, 96, 126, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_TOOLS_TIP }, // tools tab - { WWT_TAB, 1, 127, 157, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_RIDES_AND_GUESTS_TIP }, // rides and peeps tab - { WWT_TAB, 1, 158, 188, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_EDITORS_TIP }, // editors tab - { WWT_TAB, 1, 189, 219, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_MISC_TIP }, // misc tab - { WWT_TAB, 1, 220, 250, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_PROMPTS_TIP }, // prompts tab - { WWT_TAB, 1, 251, 281, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_FEATURES_TIP }, // features tab - { WWT_TABLE_HEADER, 1, 5, 218, 46, 60, STR_THEMES_HEADER_WINDOW, STR_NONE }, // Window header - { WWT_TABLE_HEADER, 1, 219, 315, 46, 60, STR_THEMES_HEADER_PALETTE, STR_NONE }, // Palette header - { WWT_DROPDOWN, 1, 125, 299, 60, 71, STR_NONE, STR_NONE }, // Preset colour schemes - { WWT_BUTTON, 1, 288, 298, 61, 70, STR_DROPDOWN_GLYPH, STR_NONE }, - { WWT_BUTTON, 1, 10, 100, 82, 93, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP }, // Duplicate button - { WWT_BUTTON, 1, 110, 200, 82, 93, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP }, // Delete button - { WWT_BUTTON, 1, 210, 300, 82, 93, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP }, // Rename button - { WWT_COLOURBTN, 1, 0, 0, 0, 0, STR_NONE, STR_NONE }, // colour button mask - { WWT_SCROLL, 1, 3, 316, 60, 103, SCROLL_VERTICAL, STR_NONE }, // staff list - { WWT_CHECKBOX, 1, 10, 299, 54, 65, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS, STR_NONE }, // rct1 ride lights - { WWT_CHECKBOX, 1, 10, 299, 69, 80, STR_THEMES_OPTION_RCT1_PARK_CONTROLS, STR_NONE }, // rct1 park lights - { WWT_CHECKBOX, 1, 10, 299, 84, 95, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT, STR_NONE }, // rct1 scenario font - { WWT_CHECKBOX, 1, 10, 299, 99, 110, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR, STR_NONE }, // rct1 bottom toolbar + WINDOW_SHIM(WINDOW_TITLE, WW, WH), + MakeWidget ({ 0, 43}, {320, 64}, WWT_RESIZE, 1 ), // tab content panel + MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_SETTINGS_TIP ), // settings tab + MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_MAIN_TIP ), // main ui tab + MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_PARK_TIP ), // park tab + MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_TOOLS_TIP ), // tools tab + MakeRemapWidget({127, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_RIDES_AND_GUESTS_TIP), // rides and peeps tab + MakeRemapWidget({158, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_EDITORS_TIP ), // editors tab + MakeRemapWidget({189, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_MISC_TIP ), // misc tab + MakeRemapWidget({220, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_PROMPTS_TIP ), // prompts tab + MakeRemapWidget({251, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_FEATURES_TIP ), // features tab + MakeWidget ({ 5, 46}, {214, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_WINDOW ), // Window header + MakeWidget ({219, 46}, { 97, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_PALETTE ), // Palette header + MakeWidget ({125, 60}, {175, 12}, WWT_DROPDOWN, 1 ), // Preset colour schemes + MakeWidget ({288, 61}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), + MakeWidget ({ 10, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP ), // Duplicate button + MakeWidget ({110, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP ), // Delete button + MakeWidget ({210, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP ), // Rename button + MakeWidget ({ 0, 0}, { 1, 1}, WWT_COLOURBTN, 1 ), // colour button mask + MakeWidget ({ 3, 60}, {314, 44}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list + MakeWidget ({ 10, 54}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS ), // rct1 ride lights + MakeWidget ({ 10, 69}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights + MakeWidget ({ 10, 84}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font + MakeWidget ({ 10, 99}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ), // rct1 bottom toolbar { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index 3d2cc1fc96..e94fadfd15 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -69,12 +69,12 @@ enum WINDOW_WATER_WIDGET_IDX { WIDX_CANCEL }; +static constexpr rct_string_id WINDOW_TITLE = STR_TITLE_COMMAND_EDITOR_TITLE; static constexpr const int32_t WW = 200; static constexpr const int32_t WH = 120; -constexpr int32_t BY = 32; -constexpr int32_t BY2 = 70; -constexpr int32_t WS = 16; -static constexpr const int32_t WHA = (WW-WS*2)/2; +static constexpr int32_t BY = 32; +static constexpr int32_t BY2 = 70; +static constexpr int32_t WS = 16; static bool _window_title_command_editor_insert; static int32_t _window_title_command_editor_index; @@ -85,28 +85,25 @@ static TitleCommand command = { TITLE_SCRIPT_LOAD, { 0 } }; static TitleSequence * _sequence = nullptr; static rct_widget window_title_command_editor_widgets[] = { - { WWT_FRAME, 1, 0, WW-1, 0, WH-1, 0xFFFFFFFF, STR_NONE }, // panel / background - { WWT_CAPTION, 1, 1, WW-2, 1, 14, STR_TITLE_COMMAND_EDITOR_TITLE, STR_WINDOW_TITLE_TIP }, // title bar - { WWT_CLOSEBOX, 1, WW-13, WW-3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button - { WWT_DROPDOWN, 1, WS, WW-WS-1, BY, BY+11, STR_NONE, STR_NONE }, // Command dropdown - { WWT_BUTTON, 1, WW-WS-12, WW-WS-2, BY+1, BY+10, STR_DROPDOWN_GLYPH, STR_NONE }, - { WWT_TEXT_BOX, 1, WS, WW-WS-1, BY2, BY2+11, STR_NONE, STR_NONE }, // full textbox + WINDOW_SHIM(WINDOW_TITLE, WW, WH), + MakeWidget({ 16, 32}, { 168, 12}, WWT_DROPDOWN, 1 ), // Command dropdown + MakeWidget({172, 33}, { 11, 12}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), + MakeWidget({ 16, 70}, { 168, 12}, WWT_TEXT_BOX, 1 ), // full textbox - { WWT_TEXT_BOX, 1, WS, WS+WHA-4, BY2, BY2+11, STR_NONE, STR_NONE }, // x textbox - { WWT_TEXT_BOX, 1, WS+WHA+3, WW-WS-1, BY2, BY2+11, STR_NONE, STR_NONE }, // y textbox + MakeWidget({ 16, 70}, { 81, 12}, WWT_TEXT_BOX, 1 ), // x textbox + MakeWidget({103, 70}, { 81, 12}, WWT_TEXT_BOX, 1 ), // y textbox - { WWT_DROPDOWN, 1, 16, WW-17, BY2, BY2+11, STR_NONE, STR_NONE }, // Save dropdown - { WWT_BUTTON, 1, WW-28, WW-18, BY2+1, BY2+10, STR_DROPDOWN_GLYPH, STR_NONE }, + MakeWidget({ 16, 70}, { 168, 12}, WWT_DROPDOWN, 1 ), // Save dropdown + MakeWidget({172, 71}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), - { WWT_BUTTON, 1, WS+WHA+3, WW-WS-1, BY2-14, BY2-3, STR_TITLE_COMMAND_EDITOR_ACTION_GET_LOCATION, STR_NONE }, // Get location/zoom/etc - { WWT_BUTTON, 1, WS+WHA+12, WW-WS-1, BY2-14, BY2-3, STR_TITLE_COMMAND_EDITOR_ACTION_SELECT_SCENARIO, STR_NONE }, // Select scenario + MakeWidget({103, 56}, { 81, 12}, WWT_BUTTON, 1, STR_TITLE_COMMAND_EDITOR_ACTION_GET_LOCATION ), // Get location/zoom/etc + MakeWidget({112, 56}, { 72, 12}, WWT_BUTTON, 1, STR_TITLE_COMMAND_EDITOR_ACTION_SELECT_SCENARIO), // Select scenario - { WWT_BUTTON, 1, WS, WW-WS-1, BY2-14, BY2-3, STR_TITLE_COMMAND_EDITOR_SELECT_SPRITE, STR_NONE }, // Select sprite - { WWT_VIEWPORT, 1, WS, WW-WS-1, BY2, BY2+22, STR_NONE, STR_NONE }, // Viewport - - { WWT_BUTTON, 1, 10, 80, WH-21, WH-10, STR_OK, STR_NONE }, // OKAY - { WWT_BUTTON, 1, WW-80, WW-10, WH-21, WH-10, STR_CANCEL, STR_NONE }, // Cancel + MakeWidget({ 16, 56}, { 168, 12}, WWT_BUTTON, 1, STR_TITLE_COMMAND_EDITOR_SELECT_SPRITE ), // Select sprite + MakeWidget({ 16, 70}, { 168, 24}, WWT_VIEWPORT, 1 ), // Viewport + MakeWidget({ 10, 99}, { 71, 14}, WWT_BUTTON, 1, STR_OK ), // OKAY + MakeWidget({120, 99}, { 71, 14}, WWT_BUTTON, 1, STR_CANCEL ), // Cancel { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 3bfbf1d1dc..8df1fff70e 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -135,55 +135,53 @@ enum WINDOW_TITLE_EDITOR_WIDGET_IDX { // Increase BW if certain languages do not fit // BW should be a multiple of 4 +static constexpr const rct_string_id WINDOW_TITLE = STR_TITLE_EDITOR_TITLE; static constexpr const int32_t WW = 320; static constexpr const int32_t WH = 270; -constexpr int32_t BX = 8; -constexpr int32_t BW = 72; -constexpr int32_t BY = 52; -constexpr int32_t BH = 63; -constexpr int32_t BS = 18; -constexpr int32_t SCROLL_WIDTH = 350; static constexpr const int32_t WH2 = 127; +static constexpr const ScreenSize ACTION_BTN = { 91, 14 }; +static constexpr const ScreenSize EDIT_BTN = { 72, 14 }; +static constexpr const ScreenSize PLAYBACK_BTN = { 18, 17 }; +static constexpr const ScreenSize REORDER_BTN = { 36, 14 }; + +static constexpr int32_t SCROLL_WIDTH = 350; static rct_widget window_title_editor_widgets[] = { - { WWT_FRAME, 0, 0, WW-1, 0, WH2-1, 0xFFFFFFFF, STR_NONE }, // panel / background - { WWT_CAPTION, 0, 1, WW-2, 1, 14, STR_TITLE_EDITOR_TITLE, STR_WINDOW_TITLE_TIP }, // title bar - { WWT_CLOSEBOX, 0, WW-13, WW-3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close button - { WWT_RESIZE, 1, 0, WW-1, 43, WH2-1, 0xFFFFFFFF, STR_NONE }, // tab content panel - { WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_THEMES_TAB_SETTINGS_TIP }, // presets tab - { WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_TITLE_EDITOR_SAVES_TAB_TIP }, // saves tab - { WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_TITLE_EDITOR_SCRIPT_TAB_TIP }, // script tab - { WWT_SCROLL, 1, BX+BW+9,WW-4, 48, WH-4, SCROLL_BOTH, STR_NONE }, // command/save list + WINDOW_SHIM(WINDOW_TITLE, WW, WH), + MakeWidget ({ 0, 43}, { 320, 84}, WWT_RESIZE, 1 ), // tab content panel + MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_SETTINGS_TIP ), // presets tab + MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TITLE_EDITOR_SAVES_TAB_TIP ), // saves tab + MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TITLE_EDITOR_SCRIPT_TAB_TIP ), // script tab + MakeWidget ({ 89, 48}, { 228, 219}, WWT_SCROLL, 1, SCROLL_BOTH ), // command/save list // Presets Tab - { WWT_DROPDOWN, 1, 125, 299, 60, 71, STR_NONE, STR_NONE }, // Preset title sequences - { WWT_BUTTON, 1, 288, 298, 61, 70, STR_DROPDOWN_GLYPH, STR_NONE }, - { WWT_BUTTON, 1, 10, 100, 82, 93, STR_TITLE_EDITOR_ACTION_CREATE, STR_TITLE_EDITOR_ACTION_CREATE_SEQUENCE_TIP }, // Create button - { WWT_BUTTON, 1, 10, 100, 82+20, 93+20, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_TITLE_EDITOR_ACTION_DUPLICATE_SEQUENCE_TIP }, // Duplicate button - { WWT_BUTTON, 1, 110, 200, 82, 93, STR_TRACK_MANAGE_DELETE, STR_TITLE_EDITOR_ACTION_DELETE_SEQUENCE_TIP }, // Delete button - { WWT_BUTTON, 1, 210, 300, 82, 93, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ACTION_RENAME_SEQUENCE_TIP }, // Rename button + MakeWidget ({ 125, 60}, { 175, 14}, WWT_DROPDOWN, 1 ), // Preset title sequences + MakeWidget ({ 288, 61}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), + MakeWidget ({ 10, 82}, ACTION_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_CREATE, STR_TITLE_EDITOR_ACTION_CREATE_SEQUENCE_TIP ), // Create button + MakeWidget ({ 10, 102}, ACTION_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_TITLE_EDITOR_ACTION_DUPLICATE_SEQUENCE_TIP), // Duplicate button + MakeWidget ({ 110, 82}, ACTION_BTN, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_TITLE_EDITOR_ACTION_DELETE_SEQUENCE_TIP ), // Delete button + MakeWidget ({ 210, 82}, ACTION_BTN, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ACTION_RENAME_SEQUENCE_TIP ), // Rename button // Saves Tab - { WWT_BUTTON, 1, BX, BX+BW-1,BY, BH, STR_TITLE_EDITOR_ACTION_ADD, STR_TITLE_EDITOR_ACTION_ADD_TIP }, // Add - { WWT_BUTTON, 1, BX, BX+BW-1,BY+(BS*1), BH+(BS*1), STR_TITLE_EDITOR_ACTION_REMOVE, STR_TITLE_EDITOR_ACTION_REMOVE_TIP }, // Remove - { WWT_BUTTON, 1, BX, BX+BW-1,BY+(BS*2), BH+(BS*2), STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ACTION_RENAME_TIP }, // Rename - { WWT_BUTTON, 1, BX, BX+BW-1,BY+(BS*3), BH+(BS*3), STR_TITLE_EDITOR_ACTION_LOAD, STR_TITLE_EDITOR_ACTION_LOAD_TIP }, // Load + MakeWidget ({ 8, 52}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_ADD, STR_TITLE_EDITOR_ACTION_ADD_TIP ), // Add + MakeWidget ({ 8, 70}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_REMOVE, STR_TITLE_EDITOR_ACTION_REMOVE_TIP ), // Remove + MakeWidget ({ 8, 88}, EDIT_BTN, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ACTION_RENAME_TIP ), // Rename + MakeWidget ({ 8, 106}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_LOAD, STR_TITLE_EDITOR_ACTION_LOAD_TIP ), // Load // Script Tab - { WWT_BUTTON, 1, BX, BX+BW-1,BY, BH, STR_TITLE_EDITOR_ACTION_INSERT, STR_TITLE_EDITOR_ACTION_INSERT_TIP }, // Insert - { WWT_BUTTON, 1, BX, BX+BW-1,BY+(BS*1), BH+(BS*1), STR_TITLE_EDITOR_ACTION_EDIT, STR_TITLE_EDITOR_ACTION_EDIT_TIP }, // Edit - { WWT_BUTTON, 1, BX, BX+BW-1,BY+(BS*2), BH+(BS*2), STR_TRACK_MANAGE_DELETE, STR_TITLE_EDITOR_ACTION_DELETE_TIP }, // Delete - //{ WWT_DROPDOWN_BUTTON, 1, BX, BX+BW-1,BY+(BS*3), BH+(BS*3), STR_TITLE_EDITOR_ACTION_RELOAD, STR_TITLE_EDITOR_ACTION_RELOAD_TIP }, // Reload - { WWT_BUTTON, 1, BX, BX+BW-1,BY+(BS*3), BH+(BS*3), STR_TITLE_EDITOR_ACTION_SKIP_TO, STR_TITLE_EDITOR_ACTION_SKIP_TO_TIP }, // Skip to + MakeWidget ({ 8, 52}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_INSERT, STR_TITLE_EDITOR_ACTION_INSERT_TIP ), // Insert + MakeWidget ({ 8, 70}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_EDIT, STR_TITLE_EDITOR_ACTION_EDIT_TIP ), // Edit + MakeWidget ({ 8, 88}, EDIT_BTN, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_TITLE_EDITOR_ACTION_DELETE_TIP ), // Delete + // MakeWidget ({ 8, 106}, EDIT_BTN, WWT_DROPDOWN_BUTTON, 1, STR_TITLE_EDITOR_ACTION_RELOAD, STR_TITLE_EDITOR_ACTION_RELOAD_TIP ), // Reload + MakeWidget ({ 8, 106}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_SKIP_TO, STR_TITLE_EDITOR_ACTION_SKIP_TO_TIP ), // Skip to - { WWT_BUTTON, 1, BX, BX+BW/2-1,BY+(BS*5),BH+(BS*5), STR_DOWN, STR_TITLE_EDITOR_ACTION_MOVE_DOWN_TIP }, // Move down - { WWT_BUTTON, 1, BX+BW/2,BX+BW-1,BY+(BS*5), BH+(BS*5), STR_UP, STR_TITLE_EDITOR_ACTION_MOVE_UP_TIP }, // Move up - - { WWT_IMGBTN, 1, BX, BX+BW/4-1, WH-32, WH-16, SPR_G2_TITLE_RESTART, STR_TITLE_EDITOR_ACTION_REPLAY_TIP }, // Replay - { WWT_IMGBTN, 1, BX+BW/4,BX+BW/2-1, WH-32, WH-16, SPR_G2_TITLE_STOP, STR_TITLE_EDITOR_ACTION_STOP_TIP }, // Stop - { WWT_IMGBTN, 1, BX+BW/2,BX+BW*3/4-1,WH-32, WH-16, SPR_G2_TITLE_PLAY, STR_TITLE_EDITOR_ACTION_PLAY_TIP }, // Play - { WWT_IMGBTN, 1, BX+BW*3/4,BX+BW, WH-32, WH-16, SPR_G2_TITLE_SKIP, STR_TITLE_EDITOR_ACTION_SKIP_TIP }, // Skip + MakeWidget ({ 8, 142}, REORDER_BTN, WWT_BUTTON, 1, STR_DOWN, STR_TITLE_EDITOR_ACTION_MOVE_DOWN_TIP ), // Move down + MakeWidget ({ 44, 142}, REORDER_BTN, WWT_BUTTON, 1, STR_UP, STR_TITLE_EDITOR_ACTION_MOVE_UP_TIP ), // Move up + MakeWidget ({ 8, 238}, PLAYBACK_BTN, WWT_IMGBTN, 1, SPR_G2_TITLE_RESTART, STR_TITLE_EDITOR_ACTION_REPLAY_TIP ), // Replay + MakeWidget ({ 26, 238}, PLAYBACK_BTN, WWT_IMGBTN, 1, SPR_G2_TITLE_STOP, STR_TITLE_EDITOR_ACTION_STOP_TIP ), // Stop + MakeWidget ({ 44, 238}, PLAYBACK_BTN, WWT_IMGBTN, 1, SPR_G2_TITLE_PLAY, STR_TITLE_EDITOR_ACTION_PLAY_TIP ), // Play + MakeWidget ({ 62, 238}, PLAYBACK_BTN, WWT_IMGBTN, 1, SPR_G2_TITLE_SKIP, STR_TITLE_EDITOR_ACTION_SKIP_TIP ), // Skip { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index ef6acc8ecc..879b58e23b 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -227,34 +227,33 @@ static constexpr const int32_t right_aligned_widgets_order[] = { #pragma endregion static rct_widget window_top_toolbar_widgets[] = { - { WWT_TRNBTN, 0, 0x0000, 0x001D, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP }, // Pause - { WWT_TRNBTN, 0, 0x001E + 30, 0x003B + 30, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP }, // File menu - { WWT_TRNBTN, 0, 0x00DC + 30, 0x00F9 + 30, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_G2_TOOLBAR_MUTE, STR_TOOLBAR_MUTE_TIP }, // Mute - { WWT_TRNBTN, 1, 0x0046 + 30, 0x0063 + 30, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP }, // Zoom out - { WWT_TRNBTN, 1, 0x0064 + 30, 0x0081 + 30, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP }, // Zoom in - { WWT_TRNBTN, 1, 0x0082 + 30, 0x009F + 30, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_ROTATE, STR_ROTATE_TIP }, // Rotate camera - { WWT_TRNBTN, 1, 0x00A0 + 30, 0x00BD + 30, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP }, // Transparency menu - { WWT_TRNBTN, 1, 0x00BE + 30, 0x00DB + 30, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP }, // Map - { WWT_TRNBTN, 2, 0x010B, 0x0128, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP }, // Land - { WWT_TRNBTN, 2, 0x0129, 0x0146, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP }, // Water - { WWT_TRNBTN, 2, 0x0147, 0x0164, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP }, // Scenery - { WWT_TRNBTN, 2, 0x0165, 0x0182, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP }, // Path - { WWT_TRNBTN, 2, 0x0183, 0x01A0, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP }, // Construct ride - { WWT_TRNBTN, 3, 0x01EA, 0x0207, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP }, // Rides - { WWT_TRNBTN, 3, 0x0208, 0x0225, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP }, // Park - { WWT_TRNBTN, 3, 0x0226, 0x0243, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_STAFF_TIP }, // Staff - { WWT_TRNBTN, 3, 0x0230, 0x024D, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_GUESTS, STR_GUESTS_TIP }, // Guests - { WWT_TRNBTN, 2, 0x0230, 0x024D, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP }, // Clear scenery - { WWT_TRNBTN, 0, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_GAME_SPEED_TIP }, // Fast forward - { WWT_TRNBTN, 0, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_CHEATS_TIP }, // Cheats - { WWT_TRNBTN, 0, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_DEBUG_TIP }, // Debug - { WWT_TRNBTN, 3, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_SCENARIO_OPTIONS_FINANCIAL_TIP },// Finances - { WWT_TRNBTN, 3, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_FINANCES_RESEARCH_TIP }, // Research - { WWT_TRNBTN, 3, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_SHOW_RECENT_MESSAGES_TIP }, // News - { WWT_TRNBTN, 0, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP }, // Network - { WWT_TRNBTN, 0, 0x001E, 0x003B, 0, TOP_TOOLBAR_HEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP }, // Chat - - { WWT_EMPTY, 0, 0, 10-1, 0, 0, 0xFFFFFFFF, STR_NONE }, // Artificial widget separator + MakeRemapWidget({ 0, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP ), // Pause + MakeRemapWidget({ 60, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP ), // File menu + MakeRemapWidget({250, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_G2_TOOLBAR_MUTE, STR_TOOLBAR_MUTE_TIP ), // Mute + MakeRemapWidget({100, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // Zoom out + MakeRemapWidget({130, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP ), // Zoom in + MakeRemapWidget({160, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_ROTATE, STR_ROTATE_TIP ), // Rotate camera + MakeRemapWidget({190, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP ), // Transparency menu + MakeRemapWidget({220, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP ), // Map + MakeRemapWidget({267, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP ), // Land + MakeRemapWidget({297, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP ), // Water + MakeRemapWidget({327, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP ), // Scenery + MakeRemapWidget({357, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP ), // Path + MakeRemapWidget({387, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP ), // Construct ride + MakeRemapWidget({490, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP ), // Rides + MakeRemapWidget({520, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP ), // Park + MakeRemapWidget({550, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TAB_TOOLBAR, STR_STAFF_TIP ), // Staff + MakeRemapWidget({560, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TOOLBAR_GUESTS, STR_GUESTS_TIP ), // Guests + MakeRemapWidget({560, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP ), // Clear scenery + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TAB_TOOLBAR, STR_GAME_SPEED_TIP ), // Fast forward + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TAB_TOOLBAR, STR_CHEATS_TIP ), // Cheats + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TAB_TOOLBAR, STR_DEBUG_TIP ), // Debug + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TAB_TOOLBAR, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), // Finances + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TAB_TOOLBAR, STR_FINANCES_RESEARCH_TIP ), // Research + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TAB_TOOLBAR, STR_SHOW_RECENT_MESSAGES_TIP ), // News + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP ), // Network + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP ), // Chat + MakeWidget ({ 0, 0}, {10, 1}, WWT_EMPTY, 0 ), // Artificial widget separator { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 17336c6f76..df2c983c81 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -36,15 +36,15 @@ enum { static rct_widget window_track_manage_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - { WWT_BUTTON, 0, 10, 119, 24, 35, STR_TRACK_MANAGE_RENAME, STR_NONE }, - { WWT_BUTTON, 0, 130, 239, 24, 35, STR_TRACK_MANAGE_DELETE, STR_NONE }, + MakeWidget({ 10, 24}, {110, 12}, WWT_BUTTON, 0, STR_TRACK_MANAGE_RENAME), + MakeWidget({130, 24}, {110, 12}, WWT_BUTTON, 0, STR_TRACK_MANAGE_DELETE), { WIDGETS_END } }; static rct_widget window_track_delete_prompt_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - { WWT_BUTTON, 0, 10, 119, 54, 65, STR_TRACK_MANAGE_DELETE, STR_NONE }, - { WWT_BUTTON, 0, 130, 239, 54, 65, STR_CANCEL, STR_NONE }, + MakeWidget({ 10, 54}, {110, 12}, WWT_BUTTON, 0, STR_TRACK_MANAGE_DELETE), + MakeWidget({130, 54}, {110, 12}, WWT_BUTTON, 0, STR_CANCEL ), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 926c31889a..9ec77df793 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -62,10 +62,10 @@ validate_global_widx(WC_TRACK_DESIGN_PLACE, WIDX_ROTATE); static rct_widget window_track_place_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - { WWT_FLATBTN, 0, 173, 196, 83, 106, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP }, - { WWT_FLATBTN, 0, 173, 196, 59, 82, SPR_MIRROR_ARROW, STR_MIRROR_IMAGE_TIP }, - { WWT_BUTTON, 0, 4, 195, 109, 120, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP }, - { WWT_EMPTY, 0, 0, 0, 0, 0, 0xFFFFFFFF, STR_NONE }, + MakeWidget({173, 83}, { 24, 24}, WWT_FLATBTN, 0, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), + MakeWidget({173, 59}, { 24, 24}, WWT_FLATBTN, 0, SPR_MIRROR_ARROW, STR_MIRROR_IMAGE_TIP ), + MakeWidget({ 4, 109}, {192, 12}, WWT_BUTTON, 0, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index bec1d66e53..5217ded2e9 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -46,13 +46,13 @@ validate_global_widx(WC_TRACK_DESIGN_LIST, WIDX_ROTATE); static rct_widget window_track_list_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - { WWT_TABLE_HEADER, 0, 4, 221, 18, 30, STR_SELECT_OTHER_RIDE, STR_NONE }, - { WWT_TEXT_BOX, 1, 4, 127, 32, 44, STR_NONE, STR_NONE }, - { WWT_BUTTON, 0, 130, 221, 32, 44, STR_OBJECT_SEARCH_CLEAR, STR_NONE }, - { WWT_SCROLL, 0, 4, 221, 46, 426, SCROLL_VERTICAL, STR_CLICK_ON_DESIGN_TO_BUILD_IT_TIP }, - { WWT_FLATBTN, 0, 224, 595, 18, 236, 0xFFFFFFFF, STR_NONE }, - { WWT_FLATBTN, 0, 574, 597, 405, 428, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP }, - { WWT_FLATBTN, 0, 574, 597, 381, 404, SPR_SCENERY, STR_TOGGLE_SCENERY_TIP }, + MakeWidget({ 4, 18}, {218, 13}, WWT_TABLE_HEADER, 0, STR_SELECT_OTHER_RIDE ), + MakeWidget({ 4, 32}, {124, 13}, WWT_TEXT_BOX, 1 ), + MakeWidget({130, 32}, { 92, 13}, WWT_BUTTON, 0, STR_OBJECT_SEARCH_CLEAR ), + MakeWidget({ 4, 46}, {218, 381}, WWT_SCROLL, 0, SCROLL_VERTICAL, STR_CLICK_ON_DESIGN_TO_BUILD_IT_TIP), + MakeWidget({224, 18}, {372, 219}, WWT_FLATBTN, 0 ), + MakeWidget({574, 405}, { 24, 24}, WWT_FLATBTN, 0, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), + MakeWidget({574, 381}, { 24, 24}, WWT_FLATBTN, 0, SPR_SCENERY, STR_TOGGLE_SCENERY_TIP ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index daa899daad..7c28386041 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -45,20 +45,20 @@ static DISPLAY_TYPE gClipHeightDisplayType = DISPLAY_TYPE::DISPLAY_UNITS; #pragma region Widgets +static constexpr const rct_string_id WINDOW_TITLE = STR_VIEW_CLIPPING_TITLE; static constexpr const int32_t WW = 180; static constexpr const int32_t WH = 155; static rct_widget window_view_clipping_widgets[] = { - { WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE }, // panel / background - { WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_VIEW_CLIPPING_TITLE, STR_WINDOW_TITLE_TIP }, // title bar - { WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button - { WWT_CHECKBOX, 0, 11, WW - 11, 19, 29, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP }, // clip enable/disable check box - { WWT_GROUPBOX, 0, 5, WW - 6, 36, 83, STR_VIEW_CLIPPING_VERTICAL_CLIPPING, STR_NONE }, - SPINNER_WIDGETS (0, 90, WW - 12, 51, 62, STR_NONE, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE), // clip height (3 widgets) - { WWT_SCROLL, 0, 11, WW - 12, 66, 78, SCROLL_HORIZONTAL, STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP }, // clip height scrollbar - { WWT_GROUPBOX, 0, 5, WW - 6, 90, WH - 6, STR_VIEW_CLIPPING_HORIZONTAL_CLIPPING, STR_NONE }, - { WWT_BUTTON, 0, 11, WW - 12, 105, 121, STR_VIEW_CLIPPING_SELECT_AREA, STR_NONE }, // selector - { WWT_BUTTON, 0, 11, WW - 12, 126, 143, STR_VIEW_CLIPPING_CLEAR_SELECTION, STR_NONE }, // clear + WINDOW_SHIM(WINDOW_TITLE, WW, WH), + MakeWidget ({ 11, 19}, { 159, 11}, WWT_CHECKBOX, 0, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP ), // clip enable/disable check box + MakeWidget ({ 5, 36}, {WW - 10, 48}, WWT_GROUPBOX, 0, STR_VIEW_CLIPPING_VERTICAL_CLIPPING ), + MakeSpinnerWidgets({ 90, 51}, { 79, 12}, WWT_SPINNER, 0, STR_NONE, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE), // clip height (3 widgets) + MakeWidget ({ 11, 66}, { 158, 13}, WWT_SCROLL, 0, SCROLL_HORIZONTAL, STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP ), // clip height scrollbar + MakeWidget ({ 5, 90}, {WW - 10, 60}, WWT_GROUPBOX, 0, STR_VIEW_CLIPPING_HORIZONTAL_CLIPPING ), + MakeWidget ({ 11, 105}, { 158, 17}, WWT_BUTTON, 0, STR_VIEW_CLIPPING_SELECT_AREA ), // selector + MakeWidget ({ 11, 126}, { 158, 18}, WWT_BUTTON, 0, STR_VIEW_CLIPPING_CLEAR_SELECTION ), // clear + { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 5f7cdf66e7..7c6ed150b5 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -33,12 +33,11 @@ enum { static rct_widget window_viewport_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - { WWT_RESIZE, 1, 0, 0, 14, 0, 0xFFFFFFFF, STR_NONE }, // resize - { WWT_VIEWPORT, 0, 3, 0, 17, 0, 0xFFFFFFFF, STR_NONE }, // viewport - - { WWT_FLATBTN, 0, 0, 0, 17, 40, SPR_G2_ZOOM_IN, STR_ZOOM_IN_TIP }, // zoom in - { WWT_FLATBTN, 0, 0, 0, 41, 64, SPR_G2_ZOOM_OUT, STR_ZOOM_OUT_TIP }, // zoom out - { WWT_FLATBTN, 0, 0, 0, 65, 88, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, // locate + MakeWidget({ 0, 14}, { WW - 1, WH - 1}, WWT_RESIZE, 1 ), // resize + MakeWidget({ 3, 17}, {WW - 26, WH - 3}, WWT_VIEWPORT, 0 ), // viewport + MakeWidget({WW - 25, 17}, { 24, 24}, WWT_FLATBTN, 0, SPR_G2_ZOOM_IN, STR_ZOOM_IN_TIP ), // zoom in + MakeWidget({WW - 25, 41}, { 24, 24}, WWT_FLATBTN, 0, SPR_G2_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // zoom out + MakeWidget({WW - 25, 65}, { 24, 24}, WWT_FLATBTN, 0, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP), // locate { WIDGETS_END }, };