mirror of https://github.com/OpenRCT2/OpenRCT2.git
Make bottom toolbar panels bigger to hold longer date strings
This commit is contained in:
parent
c0b2c79aad
commit
6380ce63d9
|
@ -47,21 +47,26 @@ enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX {
|
||||||
WIDX_DATE
|
WIDX_DATE
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// Right panel needs to be a bit bigger than original so dates like "22nd September, Year 126" can fit.
|
||||||
|
// Left panel size was also increased for symmetry.
|
||||||
|
#define WIDTH_MOD 22
|
||||||
|
|
||||||
rct_widget window_game_bottom_toolbar_widgets[] = {
|
rct_widget window_game_bottom_toolbar_widgets[] = {
|
||||||
{ WWT_IMGBTN, 0, 0x0000, 0x0077, 0, 33, 0xFFFFFFFF, STR_NONE }, // Left outset panel
|
{ WWT_IMGBTN, 0, 0x0000, 0x0077+WIDTH_MOD, 0, 33, 0xFFFFFFFF, STR_NONE }, // Left outset panel
|
||||||
{ WWT_IMGBTN, 0, 0x0002, 0x0075, 2, 31, 0xFFFFFFFF, STR_NONE }, // Left inset panel
|
{ WWT_IMGBTN, 0, 0x0002, 0x0075+WIDTH_MOD, 2, 31, 0xFFFFFFFF, STR_NONE }, // Left inset panel
|
||||||
{ WWT_FLATBTN, 0, 0x0002, 0x0075, 1, 12, 0xFFFFFFFF, STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP }, // Money window
|
{ WWT_FLATBTN, 0, 0x0002, 0x0075+WIDTH_MOD, 1, 12, 0xFFFFFFFF, STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP }, // Money window
|
||||||
{ WWT_FLATBTN, 0, 0x0002, 0x0075, 11, 22, 0xFFFFFFFF, STR_NONE }, // Guests window
|
{ WWT_FLATBTN, 0, 0x0002, 0x0075+WIDTH_MOD, 11, 22, 0xFFFFFFFF, STR_NONE }, // Guests window
|
||||||
{ WWT_FLATBTN, 0, 0x0002, 0x0075, 21, 31, 0xFFFFFFFF, STR_PARK_RATING_TIP }, // Park rating window
|
{ WWT_FLATBTN, 0, 0x0002, 0x0075+WIDTH_MOD, 21, 31, 0xFFFFFFFF, STR_PARK_RATING_TIP }, // Park rating window
|
||||||
|
|
||||||
{ WWT_IMGBTN, 2, 0x0078, 0x0207, 0, 33, 0xFFFFFFFF, STR_NONE }, // Middle outset panel
|
{ WWT_IMGBTN, 2, 0x0078+WIDTH_MOD, 0x0207-WIDTH_MOD, 0, 33, 0xFFFFFFFF, STR_NONE }, // Middle outset panel
|
||||||
{ WWT_25, 2, 0x007A, 0x0205, 2, 31, 0xFFFFFFFF, STR_NONE }, // Middle inset panel
|
{ WWT_25, 2, 0x007A+WIDTH_MOD, 0x0205-WIDTH_MOD, 2, 31, 0xFFFFFFFF, STR_NONE }, // Middle inset panel
|
||||||
{ WWT_FLATBTN, 2, 0x007D, 0x0094, 5, 28, 0xFFFFFFFF, STR_SHOW_SUBJECT_TIP }, // Associated news item window
|
{ WWT_FLATBTN, 2, 0x007D+WIDTH_MOD, 0x0094+WIDTH_MOD, 5, 28, 0xFFFFFFFF, STR_SHOW_SUBJECT_TIP }, // Associated news item window
|
||||||
{ WWT_FLATBTN, 2, 0x01EB, 0x0202, 5, 28, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, // Scroll to news item target
|
{ WWT_FLATBTN, 2, 0x01EB-WIDTH_MOD, 0x0202-WIDTH_MOD, 5, 28, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, // Scroll to news item target
|
||||||
|
|
||||||
{ WWT_IMGBTN, 0, 0x0208, 0x027F, 0, 33, 0xFFFFFFFF, STR_NONE }, // Right outset panel
|
{ WWT_IMGBTN, 0, 0x0208-WIDTH_MOD, 0x027F, 0, 33, 0xFFFFFFFF, STR_NONE }, // Right outset panel
|
||||||
{ WWT_IMGBTN, 0, 0x020A, 0x027D, 2, 31, 0xFFFFFFFF, STR_NONE }, // Right inset panel
|
{ WWT_IMGBTN, 0, 0x020A-WIDTH_MOD, 0x027D, 2, 31, 0xFFFFFFFF, STR_NONE }, // Right inset panel
|
||||||
{ WWT_FLATBTN, 0, 0x020A, 0x027D, 2, 13, 0xFFFFFFFF, 2290 }, // Date
|
{ WWT_FLATBTN, 0, 0x020A-WIDTH_MOD, 0x027D, 2, 13, 0xFFFFFFFF, 2290 }, // Date
|
||||||
{ WIDGETS_END },
|
{ WIDGETS_END },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -268,7 +273,7 @@ static void window_game_bottom_toolbar_invalidate()
|
||||||
window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].right = x;
|
window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].right = x;
|
||||||
x -= 2;
|
x -= 2;
|
||||||
window_game_bottom_toolbar_widgets[WIDX_RIGHT_INSET].right = x;
|
window_game_bottom_toolbar_widgets[WIDX_RIGHT_INSET].right = x;
|
||||||
x -= 115;
|
x -= (115 + WIDTH_MOD);
|
||||||
window_game_bottom_toolbar_widgets[WIDX_RIGHT_INSET].left = x;
|
window_game_bottom_toolbar_widgets[WIDX_RIGHT_INSET].left = x;
|
||||||
x -= 2;
|
x -= 2;
|
||||||
window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left = x;
|
window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left = x;
|
||||||
|
@ -441,8 +446,8 @@ static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi,
|
||||||
{
|
{
|
||||||
short bar_width;
|
short bar_width;
|
||||||
|
|
||||||
bar_width = (factor * 90) / 256;
|
bar_width = (factor * (90 + WIDTH_MOD)) / 256;
|
||||||
gfx_fill_rect_inset(dpi, x, y + 1, x + 93, y + 9, w->colours[1], 48);
|
gfx_fill_rect_inset(dpi, x, y + 1, x + (93 + WIDTH_MOD), y + 9, w->colours[1], 48);
|
||||||
if (!(colour & 0x80000000) || RCT2_GLOBAL(RCT2_ADDRESS_GAME_PAUSED, uint8) != 0 || (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint8) & 8)) {
|
if (!(colour & 0x80000000) || RCT2_GLOBAL(RCT2_ADDRESS_GAME_PAUSED, uint8) != 0 || (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint8) & 8)) {
|
||||||
if (bar_width > 2)
|
if (bar_width > 2)
|
||||||
gfx_fill_rect_inset(dpi, x + 2, y + 2, x + bar_width - 1, y + 8, colour & 0x7FFFFFFF, 0);
|
gfx_fill_rect_inset(dpi, x + 2, y + 2, x + bar_width - 1, y + 8, colour & 0x7FFFFFFF, 0);
|
||||||
|
@ -450,7 +455,7 @@ static void window_game_bottom_toolbar_draw_park_rating(rct_drawpixelinfo *dpi,
|
||||||
|
|
||||||
// Draw thumbs on the sides
|
// Draw thumbs on the sides
|
||||||
gfx_draw_sprite(dpi, SPR_RATING_LOW, x - 14, y, 0);
|
gfx_draw_sprite(dpi, SPR_RATING_LOW, x - 14, y, 0);
|
||||||
gfx_draw_sprite(dpi, SPR_RATING_HIGH, x + 92, y, 0);
|
gfx_draw_sprite(dpi, SPR_RATING_HIGH, x + (92 + WIDTH_MOD), y, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, rct_window *w)
|
static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, rct_window *w)
|
||||||
|
|
Loading…
Reference in New Issue