mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Refactor placement of top toolbar items

Browse Source
This commit is contained in:
Adrian Wielgosik
2015-02-05 22:22:35 +01:00
parent 37675718af
commit dc4d14b16b
1 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/windows/game_top_toolbar.c
View File

@@ -65,6 +65,48 @@ typedef enum {
DDIDX_QUIT_GAME = 7,
} FILE_MENU_DDIDX;
#pragma region Toolbar_widget_ordering
// todo: declare separators in the widget list itself
// from left to right
static const int left_aligned_widgets_order[] = {
WIDX_PAUSE,
//WIDX_FASTFORWARD,
WIDX_FILE_MENU,
};
// from left to right
static const int left_separator_aligned_widgets_order[] = {
WIDX_ZOOM_OUT,
WIDX_ZOOM_IN,
WIDX_ROTATE,
WIDX_VIEW_MENU,
WIDX_MAP,
};
// from right to left
static const int right_aligned_widgets_order[] = {
WIDX_GUESTS,
WIDX_STAFF,
WIDX_PARK,
WIDX_RIDES,
WIDX_RESEARCH,
WIDX_FINANCES,
};
// from right to left
static const int right_separator_aligned_widgets_order[] = {
WIDX_CONSTRUCT_RIDE,
WIDX_PATH,
WIDX_SCENERY,
WIDX_WATER,
WIDX_LAND,
WIDX_CLEAR_SCENERY,
};
#pragma endregion
static rct_widget window_game_top_toolbar_widgets[] = {
{ WWT_TRNBTN, 0, 0x0000, 0x001D, 0, 27, 0x20000000 | SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP }, // Pause
{ WWT_TRNBTN, 0, 0x001E + 30, 0x003B + 30, 0, 27, 0x20000000 | SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP }, // File menu
@@ -368,86 +410,40 @@ static void window_game_top_toolbar_invalidate()
x = RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_WIDTH, sint16);
if (x < 640)
x = 640;
x--;
window_game_top_toolbar_widgets[WIDX_GUESTS].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_GUESTS].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_STAFF].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_STAFF].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_PARK].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_PARK].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_RIDES].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_RIDES].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_RESEARCH].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_RESEARCH].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_FINANCES].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_FINANCES].left = x;
x -= 11;
window_game_top_toolbar_widgets[WIDX_CONSTRUCT_RIDE].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_CONSTRUCT_RIDE].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_PATH].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_PATH].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_SCENERY].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_SCENERY].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_WATER].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_WATER].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_LAND].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_LAND].left = x;
x -= 1;
window_game_top_toolbar_widgets[WIDX_CLEAR_SCENERY].right = x;
x -= 29;
window_game_top_toolbar_widgets[WIDX_CLEAR_SCENERY].left = x;
for (int i = 0; i < countof(right_aligned_widgets_order); ++i) {
x -= 1;
window_game_top_toolbar_widgets[right_aligned_widgets_order[i]].right = x;
x -= 29;
window_game_top_toolbar_widgets[right_aligned_widgets_order[i]].left = x;
}
x -= 10;
for (int i = 0; i < countof(right_separator_aligned_widgets_order); ++i) {
x -= 1;
window_game_top_toolbar_widgets[right_separator_aligned_widgets_order[i]].right = x;
x -= 29;
window_game_top_toolbar_widgets[right_separator_aligned_widgets_order[i]].left = x;
}
x = 0;
window_game_top_toolbar_widgets[WIDX_PAUSE].left = x;
x += 29;
window_game_top_toolbar_widgets[WIDX_PAUSE].right = x;
// x += 1;
// window_game_top_toolbar_widgets[WIDX_FASTFORWARD].left = x;
// x += 29;
// window_game_top_toolbar_widgets[WIDX_FASTFORWARD].right = x;
x += 1;
window_game_top_toolbar_widgets[WIDX_FILE_MENU].left = x;
x += 29;
window_game_top_toolbar_widgets[WIDX_FILE_MENU].right = x;
x += 11;
window_game_top_toolbar_widgets[WIDX_ZOOM_OUT].left = x;
x += 29;
window_game_top_toolbar_widgets[WIDX_ZOOM_OUT].right = x;
x += 1;
window_game_top_toolbar_widgets[WIDX_ZOOM_IN].left = x;
x += 29;
window_game_top_toolbar_widgets[WIDX_ZOOM_IN].right = x;
x += 1;
window_game_top_toolbar_widgets[WIDX_ROTATE].left = x;
x += 29;
window_game_top_toolbar_widgets[WIDX_ROTATE].right = x;
x += 1;
window_game_top_toolbar_widgets[WIDX_VIEW_MENU].left = x;
x += 29;
window_game_top_toolbar_widgets[WIDX_VIEW_MENU].right = x;
x += 1;
window_game_top_toolbar_widgets[WIDX_MAP].left = x;
x += 29;
window_game_top_toolbar_widgets[WIDX_MAP].right = x;
for (int i = 0; i < countof(left_aligned_widgets_order); ++i) {
window_game_top_toolbar_widgets[left_aligned_widgets_order[i]].left = x;
x += 29;
window_game_top_toolbar_widgets[left_aligned_widgets_order[i]].right = x;
x += 1;
}
x += 10;
for (int i = 0; i < countof(left_separator_aligned_widgets_order); ++i) {
window_game_top_toolbar_widgets[left_separator_aligned_widgets_order[i]].left = x;
x += 29;
window_game_top_toolbar_widgets[left_separator_aligned_widgets_order[i]].right = x;
x += 1;
}
// Footpath button pressed down
if (window_find_by_class(WC_FOOTPATH) == NULL)