From 2792ddfe80745c1362d0a2d8a9ee6f357bc6691f Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Sun, 21 Jul 2019 11:34:50 +0200 Subject: [PATCH] Tile Inspector: Use correct names for up/down buttons This little mistake has been around for years and is most likely caused by reordering the buttons. They used to be side-to-side, but their names were never changed, and since the order of tile elements is reversed I never noticed it was wrong. --- src/openrct2-ui/windows/TileInspector.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 44dc7a9879..6ef354aa80 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -100,8 +100,8 @@ enum WINDOW_TILE_INSPECTOR_WIDGET_IDX { WIDX_SPINNER_Y_DECREASE, WIDX_BUTTON_CORRUPT, WIDX_BUTTON_REMOVE, - WIDX_BUTTON_MOVE_DOWN, WIDX_BUTTON_MOVE_UP, + WIDX_BUTTON_MOVE_DOWN, WIDX_BUTTON_ROTATE, WIDX_BUTTON_SORT, WIDX_BUTTON_COPY, @@ -254,8 +254,8 @@ enum WINDOW_TILE_INSPECTOR_WIDGET_IDX { /* Buttons */ \ { WWT_FLATBTN, 1, BX, BW, BY, BH, SPR_MAP, STR_INSERT_CORRUPT_TIP }, /* Insert corrupt button */ \ { WWT_FLATBTN, 1, BX - BS * 1, BW - BS * 1, BY, BH, SPR_DEMOLISH, STR_REMOVE_SELECTED_ELEMENT_TIP }, /* Remove button */ \ - { WWT_BUTTON, 1, BX - BS * 2, BW - BS * 2, BY, BY + 11, STR_UP, STR_MOVE_SELECTED_ELEMENT_UP_TIP }, /* Move down */ \ - { WWT_BUTTON, 1, BX - BS * 2, BW - BS * 2, BH - 11, BH, STR_DOWN, STR_MOVE_SELECTED_ELEMENT_DOWN_TIP }, /* Move up */ \ + { WWT_BUTTON, 1, BX - BS * 2, BW - BS * 2, BY, BY + 11, STR_UP, STR_MOVE_SELECTED_ELEMENT_UP_TIP }, /* Move up */ \ + { 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 */ \ @@ -825,10 +825,10 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI case WIDX_BUTTON_PASTE: window_tile_inspector_paste_element(w); break; - case WIDX_BUTTON_MOVE_DOWN: + case WIDX_BUTTON_MOVE_UP: window_tile_inspector_swap_elements(windowTileInspectorSelectedIndex, windowTileInspectorSelectedIndex + 1); break; - case WIDX_BUTTON_MOVE_UP: + case WIDX_BUTTON_MOVE_DOWN: window_tile_inspector_swap_elements(windowTileInspectorSelectedIndex - 1, windowTileInspectorSelectedIndex); break; } @@ -1427,13 +1427,13 @@ static void window_tile_inspector_invalidate(rct_window* w) widget_set_enabled(w, WIDX_BUTTON_SORT, (windowTileInspectorTileSelected && windowTileInspectorElementCount > 1)); // Move Up button - widget_set_enabled(w, WIDX_BUTTON_MOVE_UP, (windowTileInspectorSelectedIndex > 0)); + widget_set_enabled( + w, WIDX_BUTTON_MOVE_UP, + (windowTileInspectorSelectedIndex != -1 && windowTileInspectorSelectedIndex < windowTileInspectorElementCount - 1)); widget_invalidate(w, WIDX_BUTTON_MOVE_UP); // Move Down button - widget_set_enabled( - w, WIDX_BUTTON_MOVE_DOWN, - (windowTileInspectorSelectedIndex != -1 && windowTileInspectorSelectedIndex < windowTileInspectorElementCount - 1)); + widget_set_enabled(w, WIDX_BUTTON_MOVE_DOWN, (windowTileInspectorSelectedIndex > 0)); widget_invalidate(w, WIDX_BUTTON_MOVE_DOWN); // Copy button