From 3830347294ade02faf1d57f0924bea3fcd777ece Mon Sep 17 00:00:00 2001 From: Olivier Wervers Date: Sun, 19 Apr 2020 22:41:45 +0200 Subject: [PATCH] Switch tile inspector copy paste button placement (#11358) --- distribution/changelog.txt | 1 + src/openrct2-ui/windows/TileInspector.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 34e0fd1797..5f6550e530 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -3,6 +3,7 @@ - Feature: [#9029] Open doors with the tile inspector. - Feature: [#11231] Change shortcut window list order to be more intuitive, and split it into logical sections. - Feature: [#11306] Path additions are now kept when replacing the path. +- Change: [#11358] Switch copy and paste button positions in tile inspector. - Fix: [#1148] Research funding dropdown not shown in finances window. - Fix: [#6119] Advertising campaign for ride window not updated properly (original bug). - Fix: [#11072] Land and water tools working out of bounds (original bug). diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 687834b34f..4ca09b87d8 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -105,8 +105,8 @@ enum WINDOW_TILE_INSPECTOR_WIDGET_IDX { WIDX_BUTTON_MOVE_DOWN, WIDX_BUTTON_ROTATE, WIDX_BUTTON_SORT, - WIDX_BUTTON_COPY, WIDX_BUTTON_PASTE, + WIDX_BUTTON_COPY, WIDX_COLUMN_TYPE, WIDX_COLUMN_BASEHEIGHT, WIDX_COLUMN_CLEARANCEHEIGHT, @@ -262,8 +262,8 @@ constexpr int32_t BUTTONH = 17; { WWT_BUTTON, 1, BX - BS * 2, BW - BS * 2, BH - 11, BH, STR_DOWN, STR_MOVE_SELECTED_ELEMENT_DOWN_TIP }, /* Move down */ \ { WWT_FLATBTN, 1, BX - BS * 3, BW - BS * 3, BY, BH, SPR_ROTATE_ARROW, STR_ROTATE_SELECTED_ELEMENT_TIP }, /* Rotate button */ \ { WWT_FLATBTN, 1, BX - BS * 4, BW - BS * 4, BY, BH, SPR_G2_SORT, STR_TILE_INSPECTOR_SORT_TIP }, /* Sort button */ \ - { WWT_FLATBTN, 1, BX - BS * 5, BW - BS * 5, BY, BH, SPR_G2_COPY, STR_TILE_INSPECTOR_COPY_TIP }, /* Copy button */ \ - { WWT_FLATBTN, 1, BX - BS * 6, BW - BS * 6, BY, BH, SPR_G2_PASTE, STR_TILE_INSPECTOR_PASTE_TIP }, /* Paste button */ \ + { WWT_FLATBTN, 1, BX - BS * 5, BW - BS * 5, BY, BH, SPR_G2_PASTE, STR_TILE_INSPECTOR_PASTE_TIP }, /* Paste button */ \ + { WWT_FLATBTN, 1, BX - BS * 6, BW - BS * 6, BY, BH, SPR_G2_COPY, STR_TILE_INSPECTOR_COPY_TIP }, /* Copy button */ \ /* Column headers */ \ { WWT_TABLE_HEADER, 1, COL_X_TYPE, COL_X_BH - 1, 42, 42 + 13, STR_NONE, STR_NONE }, /* Type */ \ { WWT_TABLE_HEADER, 1, COL_X_BH, COL_X_CH - 1, 42, 42 + 13, STR_NONE, STR_TILE_INSPECTOR_BASE_HEIGHT }, /* Base height */ \