mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-21 14:53:02 +01:00
Code Issues Releases Wiki Activity

Introduce a constant for scrollbar width and height (#11152)

Browse Source
This commit is contained in:
Aaron van Geffen
2020-03-30 22:41:49 +02:00
committed by GitHub
parent 3d223b0843
commit 28d14517e1
3 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2-ui/input/MouseInput.cpp
View File

@@ -620,12 +620,12 @@ static void input_scroll_begin(rct_window* w, rct_widgetindex widgetIndex, const
int32_t widget_width = widg->right - widg->left - 1; int32_t widget_width = widg->right - widg->left - 1;
if (scroll->flags & VSCROLLBAR_VISIBLE) if (scroll->flags & VSCROLLBAR_VISIBLE)
widget_width -= 11; widget_width -= SCROLLBAR_WIDTH + 1;
int32_t widget_content_width = std::max(scroll->h_right - widget_width, 0); int32_t widget_content_width = std::max(scroll->h_right - widget_width, 0);
int32_t widget_height = widg->bottom - widg->top - 1; int32_t widget_height = widg->bottom - widg->top - 1;
if (scroll->flags & HSCROLLBAR_VISIBLE) if (scroll->flags & HSCROLLBAR_VISIBLE)
widget_height -= 11; widget_height -= SCROLLBAR_WIDTH + 1;
int32_t widget_content_height = std::max(scroll->v_bottom - widget_height, 0); int32_t widget_content_height = std::max(scroll->v_bottom - widget_height, 0);
switch (scroll_area) switch (scroll_area)
@@ -742,7 +742,7 @@ static void input_scroll_part_update_hthumb(rct_window* w, rct_widgetindex widge
newLeft *= x; newLeft *= x;
x = widget->right - widget->left - 21; x = widget->right - widget->left - 21;
if (w->scrolls[scroll_id].flags & VSCROLLBAR_VISIBLE) if (w->scrolls[scroll_id].flags & VSCROLLBAR_VISIBLE)
x -= 11; x -= SCROLLBAR_WIDTH + 1;
newLeft /= x; newLeft /= x;
x = newLeft; x = newLeft;
w->scrolls[scroll_id].flags |= HSCROLLBAR_THUMB_PRESSED; w->scrolls[scroll_id].flags |= HSCROLLBAR_THUMB_PRESSED;
@@ -752,7 +752,7 @@ static void input_scroll_part_update_hthumb(rct_window* w, rct_widgetindex widge
newLeft = 0; newLeft = 0;
x = widget->right - widget->left - 1; x = widget->right - widget->left - 1;
if (w->scrolls[scroll_id].flags & VSCROLLBAR_VISIBLE) if (w->scrolls[scroll_id].flags & VSCROLLBAR_VISIBLE)
x -= 11; x -= SCROLLBAR_WIDTH + 1;
x *= -1; x *= -1;
x += w->scrolls[scroll_id].h_right; x += w->scrolls[scroll_id].h_right;
if (x < 0) if (x < 0)
@@ -781,7 +781,7 @@ static void input_scroll_part_update_vthumb(rct_window* w, rct_widgetindex widge
newTop *= y; newTop *= y;
y = widget->bottom - widget->top - 21; y = widget->bottom - widget->top - 21;
if (w->scrolls[scroll_id].flags & HSCROLLBAR_VISIBLE) if (w->scrolls[scroll_id].flags & HSCROLLBAR_VISIBLE)
y -= 11; y -= SCROLLBAR_WIDTH + 1;
newTop /= y; newTop /= y;
y = newTop; y = newTop;
w->scrolls[scroll_id].flags |= VSCROLLBAR_THUMB_PRESSED; w->scrolls[scroll_id].flags |= VSCROLLBAR_THUMB_PRESSED;
@@ -791,7 +791,7 @@ static void input_scroll_part_update_vthumb(rct_window* w, rct_widgetindex widge
newTop = 0; newTop = 0;
y = widget->bottom - widget->top - 1; y = widget->bottom - widget->top - 1;
if (w->scrolls[scroll_id].flags & HSCROLLBAR_VISIBLE) if (w->scrolls[scroll_id].flags & HSCROLLBAR_VISIBLE)
y -= 11; y -= SCROLLBAR_WIDTH + 1;
y *= -1; y *= -1;
y += w->scrolls[scroll_id].v_bottom; y += w->scrolls[scroll_id].v_bottom;
if (y < 0) if (y < 0)
@@ -835,7 +835,7 @@ static void input_scroll_part_update_hright(rct_window* w, rct_widgetindex widge
w->scrolls[scroll_id].h_left += 3; w->scrolls[scroll_id].h_left += 3;
int32_t newLeft = widget->right - widget->left - 1; int32_t newLeft = widget->right - widget->left - 1;
if (w->scrolls[scroll_id].flags & VSCROLLBAR_VISIBLE) if (w->scrolls[scroll_id].flags & VSCROLLBAR_VISIBLE)
newLeft -= 11; newLeft -= SCROLLBAR_WIDTH + 1;
newLeft *= -1; newLeft *= -1;
newLeft += w->scrolls[scroll_id].h_right; newLeft += w->scrolls[scroll_id].h_right;
if (newLeft < 0) if (newLeft < 0)
@@ -878,7 +878,7 @@ static void input_scroll_part_update_vbottom(rct_window* w, rct_widgetindex widg
w->scrolls[scroll_id].v_top += 3; w->scrolls[scroll_id].v_top += 3;
int32_t newTop = widget->bottom - widget->top - 1; int32_t newTop = widget->bottom - widget->top - 1;
if (w->scrolls[scroll_id].flags & HSCROLLBAR_VISIBLE) if (w->scrolls[scroll_id].flags & HSCROLLBAR_VISIBLE)
newTop -= 11; newTop -= SCROLLBAR_WIDTH + 1;
newTop *= -1; newTop *= -1;
newTop += w->scrolls[scroll_id].v_bottom; newTop += w->scrolls[scroll_id].v_bottom;
if (newTop < 0) if (newTop < 0)

76
src/openrct2-ui/interface/Widget.cpp
View File

@@ -646,17 +646,21 @@ static void widget_scroll_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widget
// Horizontal scrollbar // Horizontal scrollbar
if (scroll->flags & HSCROLLBAR_VISIBLE) if (scroll->flags & HSCROLLBAR_VISIBLE)
widget_hscrollbar_draw(dpi, scroll, l, b - 10, ((scroll->flags & VSCROLLBAR_VISIBLE) ? r - 11 : r), b, colour); widget_hscrollbar_draw(
dpi, scroll, l, b - SCROLLBAR_WIDTH, ((scroll->flags & VSCROLLBAR_VISIBLE) ? r - (SCROLLBAR_WIDTH + 1) : r), b,
colour);
// Vertical scrollbar // Vertical scrollbar
if (scroll->flags & VSCROLLBAR_VISIBLE) if (scroll->flags & VSCROLLBAR_VISIBLE)
widget_vscrollbar_draw(dpi, scroll, r - 10, t, r, ((scroll->flags & HSCROLLBAR_VISIBLE) ? b - 11 : b), colour); widget_vscrollbar_draw(
dpi, scroll, r - SCROLLBAR_WIDTH, t, r, ((scroll->flags & HSCROLLBAR_VISIBLE) ? b - (SCROLLBAR_WIDTH + 1) : b),
colour);
// Contents // Contents
if (scroll->flags & HSCROLLBAR_VISIBLE) if (scroll->flags & HSCROLLBAR_VISIBLE)
b -= 11; b -= (SCROLLBAR_WIDTH + 1);
if (scroll->flags & VSCROLLBAR_VISIBLE) if (scroll->flags & VSCROLLBAR_VISIBLE)
r -= 11; r -= (SCROLLBAR_WIDTH + 1);
b++; b++;
r++; r++;
@@ -689,25 +693,25 @@ static void widget_hscrollbar_draw(
{ {
colour &= 0x7F; colour &= 0x7F;
// Trough // Trough
gfx_fill_rect(dpi, l + 10, t, r - 10, b, ColourMapA[colour].lighter); gfx_fill_rect(dpi, l + SCROLLBAR_WIDTH, t, r - SCROLLBAR_WIDTH, b, ColourMapA[colour].lighter);
gfx_fill_rect(dpi, l + 10, t, r - 10, b, 0x1000000 | ColourMapA[colour].mid_dark); gfx_fill_rect(dpi, l + SCROLLBAR_WIDTH, t, r - SCROLLBAR_WIDTH, b, 0x1000000 | ColourMapA[colour].mid_dark);
gfx_fill_rect(dpi, l + 10, t + 2, r - 10, t + 2, ColourMapA[colour].mid_dark); gfx_fill_rect(dpi, l + SCROLLBAR_WIDTH, t + 2, r - SCROLLBAR_WIDTH, t + 2, ColourMapA[colour].mid_dark);
gfx_fill_rect(dpi, l + 10, t + 3, r - 10, t + 3, ColourMapA[colour].lighter); gfx_fill_rect(dpi, l + SCROLLBAR_WIDTH, t + 3, r - SCROLLBAR_WIDTH, t + 3, ColourMapA[colour].lighter);
gfx_fill_rect(dpi, l + 10, t + 7, r - 10, t + 7, ColourMapA[colour].mid_dark); gfx_fill_rect(dpi, l + SCROLLBAR_WIDTH, t + 7, r - SCROLLBAR_WIDTH, t + 7, ColourMapA[colour].mid_dark);
gfx_fill_rect(dpi, l + 10, t + 8, r - 10, t + 8, ColourMapA[colour].lighter); gfx_fill_rect(dpi, l + SCROLLBAR_WIDTH, t + 8, r - SCROLLBAR_WIDTH, t + 8, ColourMapA[colour].lighter);
// Left button // Left button
{ {
uint8_t flags = (scroll->flags & HSCROLLBAR_LEFT_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0; uint8_t flags = (scroll->flags & HSCROLLBAR_LEFT_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0;
gfx_fill_rect_inset(dpi, l, t, l + 9, b, colour, flags); gfx_fill_rect_inset(dpi, l, t, l + (SCROLLBAR_WIDTH - 1), b, colour, flags);
gfx_draw_string(dpi, static_cast<const char*>(BlackLeftArrowString), COLOUR_BLACK, l + 1, t); gfx_draw_string(dpi, static_cast<const char*>(BlackLeftArrowString), COLOUR_BLACK, l + 1, t);
} }
// Thumb // Thumb
{ {
int16_t left = std::max(l + 10, l + scroll->h_thumb_left - 1); int16_t left = std::max(l + SCROLLBAR_WIDTH, l + scroll->h_thumb_left - 1);
int16_t right = std::min(r - 10, l + scroll->h_thumb_right - 1); int16_t right = std::min(r - SCROLLBAR_WIDTH, l + scroll->h_thumb_right - 1);
uint8_t flags = (scroll->flags & HSCROLLBAR_THUMB_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0; uint8_t flags = (scroll->flags & HSCROLLBAR_THUMB_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0;
gfx_fill_rect_inset(dpi, left, t, right, b, colour, flags); gfx_fill_rect_inset(dpi, left, t, right, b, colour, flags);
@@ -717,7 +721,7 @@ static void widget_hscrollbar_draw(
{ {
uint8_t flags = (scroll->flags & HSCROLLBAR_RIGHT_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0; uint8_t flags = (scroll->flags & HSCROLLBAR_RIGHT_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0;
gfx_fill_rect_inset(dpi, r - 9, t, r, b, colour, flags); gfx_fill_rect_inset(dpi, r - (SCROLLBAR_WIDTH - 1), t, r, b, colour, flags);
gfx_draw_string(dpi, static_cast<const char*>(BlackRightArrowString), COLOUR_BLACK, r - 6, t); gfx_draw_string(dpi, static_cast<const char*>(BlackRightArrowString), COLOUR_BLACK, r - 6, t);
} }
} }
@@ -727,27 +731,30 @@ static void widget_vscrollbar_draw(
{ {
colour &= 0x7F; colour &= 0x7F;
// Trough // Trough
gfx_fill_rect(dpi, l, t + 10, r, b - 10, ColourMapA[colour].lighter); gfx_fill_rect(dpi, l, t + SCROLLBAR_WIDTH, r, b - SCROLLBAR_WIDTH, ColourMapA[colour].lighter);
gfx_fill_rect(dpi, l, t + 10, r, b - 10, 0x1000000 | ColourMapA[colour].mid_dark); gfx_fill_rect(dpi, l, t + SCROLLBAR_WIDTH, r, b - SCROLLBAR_WIDTH, 0x1000000 | ColourMapA[colour].mid_dark);
gfx_fill_rect(dpi, l + 2, t + 10, l + 2, b - 10, ColourMapA[colour].mid_dark); gfx_fill_rect(dpi, l + 2, t + SCROLLBAR_WIDTH, l + 2, b - SCROLLBAR_WIDTH, ColourMapA[colour].mid_dark);
gfx_fill_rect(dpi, l + 3, t + 10, l + 3, b - 10, ColourMapA[colour].lighter); gfx_fill_rect(dpi, l + 3, t + SCROLLBAR_WIDTH, l + 3, b - SCROLLBAR_WIDTH, ColourMapA[colour].lighter);
gfx_fill_rect(dpi, l + 7, t + 10, l + 7, b - 10, ColourMapA[colour].mid_dark); gfx_fill_rect(dpi, l + 7, t + SCROLLBAR_WIDTH, l + 7, b - SCROLLBAR_WIDTH, ColourMapA[colour].mid_dark);
gfx_fill_rect(dpi, l + 8, t + 10, l + 8, b - 10, ColourMapA[colour].lighter); gfx_fill_rect(dpi, l + 8, t + SCROLLBAR_WIDTH, l + 8, b - SCROLLBAR_WIDTH, ColourMapA[colour].lighter);
// Up button // Up button
gfx_fill_rect_inset( gfx_fill_rect_inset(
dpi, l, t, r, t + 9, colour, ((scroll->flags & VSCROLLBAR_UP_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0)); dpi, l, t, r, t + (SCROLLBAR_WIDTH - 1), colour,
((scroll->flags & VSCROLLBAR_UP_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0));
gfx_draw_string(dpi, static_cast<const char*>(BlackUpArrowString), COLOUR_BLACK, l + 1, t - 1); gfx_draw_string(dpi, static_cast<const char*>(BlackUpArrowString), COLOUR_BLACK, l + 1, t - 1);
// Thumb // Thumb
gfx_fill_rect_inset( gfx_fill_rect_inset(
dpi, l, std::max(t + 10, t + scroll->v_thumb_top - 1), r, std::min(b - 10, t + scroll->v_thumb_bottom - 1), colour, dpi, l, std::max(t + SCROLLBAR_WIDTH, t + scroll->v_thumb_top - 1), r,
std::min(b - SCROLLBAR_WIDTH, t + scroll->v_thumb_bottom - 1), colour,
((scroll->flags & VSCROLLBAR_THUMB_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0)); ((scroll->flags & VSCROLLBAR_THUMB_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0));
// Down button // Down button
gfx_fill_rect_inset( gfx_fill_rect_inset(
dpi, l, b - 9, r, b, colour, ((scroll->flags & VSCROLLBAR_DOWN_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0)); dpi, l, b - (SCROLLBAR_WIDTH - 1), r, b, colour,
gfx_draw_string(dpi, static_cast<const char*>(BlackDownArrowString), COLOUR_BLACK, l + 1, b - 9); ((scroll->flags & VSCROLLBAR_DOWN_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0));
gfx_draw_string(dpi, static_cast<const char*>(BlackDownArrowString), COLOUR_BLACK, l + 1, b - (SCROLLBAR_WIDTH - 1));
} }
/** /**
@@ -882,15 +889,16 @@ void widget_scroll_get_part(
} }
} }
if ((w->scrolls[*scroll_id].flags & HSCROLLBAR_VISIBLE) && screenCoords.y >= (w->windowPos.y + widget->bottom - 11)) if ((w->scrolls[*scroll_id].flags & HSCROLLBAR_VISIBLE)
&& screenCoords.y >= (w->windowPos.y + widget->bottom - (SCROLLBAR_WIDTH + 1)))
{ {
// horizontal scrollbar // horizontal scrollbar
int32_t rightOffset = 0; int32_t rightOffset = 0;
int32_t iteratorLeft = widget->left + w->windowPos.x + 10; int32_t iteratorLeft = widget->left + w->windowPos.x + SCROLLBAR_WIDTH;
int32_t iteratorRight = widget->right + w->windowPos.x - 10; int32_t iteratorRight = widget->right + w->windowPos.x - SCROLLBAR_WIDTH;
if (!(w->scrolls[*scroll_id].flags & VSCROLLBAR_VISIBLE)) if (!(w->scrolls[*scroll_id].flags & VSCROLLBAR_VISIBLE))
{ {
rightOffset = 11; rightOffset = SCROLLBAR_WIDTH + 1;
} }
if (screenCoords.x <= iteratorLeft) if (screenCoords.x <= iteratorLeft)
@@ -901,7 +909,7 @@ void widget_scroll_get_part(
{ {
*output_scroll_area = SCROLL_PART_NONE; *output_scroll_area = SCROLL_PART_NONE;
} }
else if (screenCoords.x >= iteratorRight + rightOffset - 10) else if (screenCoords.x >= iteratorRight + rightOffset - SCROLLBAR_WIDTH)
{ {
*output_scroll_area = SCROLL_PART_HSCROLLBAR_RIGHT; *output_scroll_area = SCROLL_PART_HSCROLLBAR_RIGHT;
} }
@@ -918,15 +926,17 @@ void widget_scroll_get_part(
*output_scroll_area = SCROLL_PART_HSCROLLBAR_THUMB; *output_scroll_area = SCROLL_PART_HSCROLLBAR_THUMB;
} }
} }
else if ((w->scrolls[*scroll_id].flags & VSCROLLBAR_VISIBLE) && (screenCoords.x >= w->windowPos.x + widget->right - 11)) else if (
(w->scrolls[*scroll_id].flags & VSCROLLBAR_VISIBLE)
&& (screenCoords.x >= w->windowPos.x + widget->right - (SCROLLBAR_WIDTH + 1)))
{ {
// vertical scrollbar // vertical scrollbar
int32_t bottomOffset = 0; int32_t bottomOffset = 0;
int32_t iteratorTop = widget->top + w->windowPos.y + 10; int32_t iteratorTop = widget->top + w->windowPos.y + SCROLLBAR_WIDTH;
int32_t iteratorBottom = widget->bottom + w->windowPos.y; int32_t iteratorBottom = widget->bottom + w->windowPos.y;
if (w->scrolls[*scroll_id].flags & HSCROLLBAR_VISIBLE) if (w->scrolls[*scroll_id].flags & HSCROLLBAR_VISIBLE)
{ {
bottomOffset = 11; bottomOffset = (SCROLLBAR_WIDTH + 1);
} }
if (screenCoords.y <= iteratorTop) if (screenCoords.y <= iteratorTop)
@@ -937,7 +947,7 @@ void widget_scroll_get_part(
{ {
*output_scroll_area = SCROLL_PART_NONE; *output_scroll_area = SCROLL_PART_NONE;
} }
else if (screenCoords.y >= (iteratorBottom - bottomOffset - 10)) else if (screenCoords.y >= (iteratorBottom - bottomOffset - SCROLLBAR_WIDTH))
{ {
*output_scroll_area = SCROLL_PART_VSCROLLBAR_BOTTOM; *output_scroll_area = SCROLL_PART_VSCROLLBAR_BOTTOM;
} }

2
src/openrct2/interface/Widget.h
View File

@@ -58,6 +58,8 @@ enum
SCROLL_BOTH = SCROLL_HORIZONTAL | SCROLL_VERTICAL SCROLL_BOTH = SCROLL_HORIZONTAL | SCROLL_VERTICAL
}; };
constexpr uint8_t SCROLLBAR_WIDTH = 10;
void widget_scroll_update_thumbs(rct_window* w, rct_widgetindex widget_index); void widget_scroll_update_thumbs(rct_window* w, rct_widgetindex widget_index);
void widget_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex); void widget_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetindex widgetIndex);