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

Rename ScrollBar struct to ScrollArea and rename its properties (#22539)

Browse Source
This commit is contained in:
Aaron van Geffen
2024-08-11 16:21:53 +02:00
committed by GitHub
parent 00be5b0d63
commit aa7eb18d78
28 changed files with 223 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,8 +210,8 @@ static void InputScrollDragContinue(const ScreenCoordsXY& screenCoords, WindowBa
int16_t size = widget.width() - 1;
if (scroll.flags & VSCROLLBAR_VISIBLE)
size -= 11;
size = std::max(0, scroll.h_right - size);
scroll.h_left = std::min<uint16_t>(std::max(0, scroll.h_left + differentialCoords.x), size);
size = std::max(0, scroll.contentWidth - size);
scroll.contentOffsetX = std::min<uint16_t>(std::max(0, scroll.contentOffsetX + differentialCoords.x), size);
}
if (scroll.flags & VSCROLLBAR_VISIBLE)
@@ -219,8 +219,8 @@ static void InputScrollDragContinue(const ScreenCoordsXY& screenCoords, WindowBa
int16_t size = widget.height() - 1;
if (scroll.flags & HSCROLLBAR_VISIBLE)
size -= 11;
size = std::max(0, scroll.v_bottom - size);
scroll.v_top = std::min<uint16_t>(std::max(0, scroll.v_top + differentialCoords.y), size);
size = std::max(0, scroll.contentHeight - size);
scroll.contentOffsetY = std::min<uint16_t>(std::max(0, scroll.contentOffsetY + differentialCoords.y), size);
}
WidgetScrollUpdateThumbs(*w, widgetIndex);
@@ -646,38 +646,38 @@ static void InputScrollBegin(WindowBase& w, WidgetIndex widgetIndex, const Scree
int32_t widget_width = widg.width() - 1;
if (scroll.flags & VSCROLLBAR_VISIBLE)
widget_width -= kScrollBarWidth + 1;
int32_t widget_content_width = std::max(scroll.h_right - widget_width, 0);
int32_t widget_content_width = std::max(scroll.contentWidth - widget_width, 0);
int32_t widget_height = widg.bottom - widg.top - 1;
if (scroll.flags & HSCROLLBAR_VISIBLE)
widget_height -= kScrollBarWidth + 1;
int32_t widget_content_height = std::max(scroll.v_bottom - widget_height, 0);
int32_t widget_content_height = std::max(scroll.contentHeight - widget_height, 0);
switch (scroll_area)
{
case SCROLL_PART_HSCROLLBAR_LEFT:
scroll.h_left = std::max(scroll.h_left - 3, 0);
scroll.contentOffsetX = std::max(scroll.contentOffsetX - 3, 0);
break;
case SCROLL_PART_HSCROLLBAR_RIGHT:
scroll.h_left = std::min(scroll.h_left + 3, widget_content_width);
scroll.contentOffsetX = std::min(scroll.contentOffsetX + 3, widget_content_width);
break;
case SCROLL_PART_HSCROLLBAR_LEFT_TROUGH:
scroll.h_left = std::max(scroll.h_left - widget_width, 0);
scroll.contentOffsetX = std::max(scroll.contentOffsetX - widget_width, 0);
break;
case SCROLL_PART_HSCROLLBAR_RIGHT_TROUGH:
scroll.h_left = std::min(scroll.h_left + widget_width, widget_content_width);
scroll.contentOffsetX = std::min(scroll.contentOffsetX + widget_width, widget_content_width);
break;
case SCROLL_PART_VSCROLLBAR_TOP:
scroll.v_top = std::max(scroll.v_top - 3, 0);
scroll.contentOffsetY = std::max(scroll.contentOffsetY - 3, 0);
break;
case SCROLL_PART_VSCROLLBAR_BOTTOM:
scroll.v_top = std::min(scroll.v_top + 3, widget_content_height);
scroll.contentOffsetY = std::min(scroll.contentOffsetY + 3, widget_content_height);
break;
case SCROLL_PART_VSCROLLBAR_TOP_TROUGH:
scroll.v_top = std::max(scroll.v_top - widget_height, 0);
scroll.contentOffsetY = std::max(scroll.contentOffsetY - widget_height, 0);
break;
case SCROLL_PART_VSCROLLBAR_BOTTOM_TROUGH:
scroll.v_top = std::min(scroll.v_top + widget_height, widget_content_height);
scroll.contentOffsetY = std::min(scroll.contentOffsetY + widget_height, widget_content_height);
break;
default:
break;
@@ -761,7 +761,7 @@ static void InputScrollPartUpdateHThumb(WindowBase& w, WidgetIndex widgetIndex,
if (WindowFindByNumber(w.classification, w.number) != nullptr)
{
int32_t newLeft;
newLeft = scroll.h_right;
newLeft = scroll.contentWidth;
newLeft *= x;
x = widget.width() - 21;
if (scroll.flags & VSCROLLBAR_VISIBLE)
@@ -769,7 +769,7 @@ static void InputScrollPartUpdateHThumb(WindowBase& w, WidgetIndex widgetIndex,
newLeft /= x;
x = newLeft;
scroll.flags |= HSCROLLBAR_THUMB_PRESSED;
newLeft = scroll.h_left;
newLeft = scroll.contentOffsetX;
newLeft += x;
if (newLeft < 0)
newLeft = 0;
@@ -777,12 +777,12 @@ static void InputScrollPartUpdateHThumb(WindowBase& w, WidgetIndex widgetIndex,
if (scroll.flags & VSCROLLBAR_VISIBLE)
x -= kScrollBarWidth + 1;
x *= -1;
x += scroll.h_right;
x += scroll.contentWidth;
if (x < 0)
x = 0;
if (newLeft > x)
newLeft = x;
scroll.h_left = newLeft;
scroll.contentOffsetX = newLeft;
WidgetScrollUpdateThumbs(w, widgetIndex);
WidgetInvalidateByNumber(w.classification, w.number, widgetIndex);
}
@@ -800,7 +800,7 @@ static void InputScrollPartUpdateVThumb(WindowBase& w, WidgetIndex widgetIndex,
if (WindowFindByNumber(w.classification, w.number) != nullptr)
{
int32_t newTop;
newTop = scroll.v_bottom;
newTop = scroll.contentHeight;
newTop *= y;
y = widget.height() - 21;
if (scroll.flags & HSCROLLBAR_VISIBLE)
@@ -808,7 +808,7 @@ static void InputScrollPartUpdateVThumb(WindowBase& w, WidgetIndex widgetIndex,
newTop /= y;
y = newTop;
scroll.flags |= VSCROLLBAR_THUMB_PRESSED;
newTop = scroll.v_top;
newTop = scroll.contentOffsetY;
newTop += y;
if (newTop < 0)
newTop = 0;
@@ -816,12 +816,12 @@ static void InputScrollPartUpdateVThumb(WindowBase& w, WidgetIndex widgetIndex,
if (scroll.flags & HSCROLLBAR_VISIBLE)
y -= kScrollBarWidth + 1;
y *= -1;
y += scroll.v_bottom;
y += scroll.contentHeight;
if (y < 0)
y = 0;
if (newTop > y)
newTop = y;
scroll.v_top = newTop;
scroll.contentOffsetY = newTop;
WidgetScrollUpdateThumbs(w, widgetIndex);
WidgetInvalidateByNumber(w.classification, w.number, widgetIndex);
}
@@ -837,8 +837,8 @@ static void InputScrollPartUpdateHLeft(WindowBase& w, WidgetIndex widgetIndex, i
{
auto& scroll = w.scrolls[scroll_id];
scroll.flags |= HSCROLLBAR_LEFT_PRESSED;
if (scroll.h_left >= 3)
scroll.h_left -= 3;
if (scroll.contentOffsetX >= 3)
scroll.contentOffsetX -= 3;
WidgetScrollUpdateThumbs(w, widgetIndex);
WidgetInvalidateByNumber(w.classification, w.number, widgetIndex);
}
@@ -855,16 +855,16 @@ static void InputScrollPartUpdateHRight(WindowBase& w, WidgetIndex widgetIndex,
{
auto& scroll = w.scrolls[scroll_id];
scroll.flags |= HSCROLLBAR_RIGHT_PRESSED;
scroll.h_left += 3;
scroll.contentOffsetX += 3;
int32_t newLeft = widget.width() - 1;
if (scroll.flags & VSCROLLBAR_VISIBLE)
newLeft -= kScrollBarWidth + 1;
newLeft *= -1;
newLeft += scroll.h_right;
newLeft += scroll.contentWidth;
if (newLeft < 0)
newLeft = 0;
if (scroll.h_left > newLeft)
scroll.h_left = newLeft;
if (scroll.contentOffsetX > newLeft)
scroll.contentOffsetX = newLeft;
WidgetScrollUpdateThumbs(w, widgetIndex);
WidgetInvalidateByNumber(w.classification, w.number, widgetIndex);
}
@@ -880,8 +880,8 @@ static void InputScrollPartUpdateVTop(WindowBase& w, WidgetIndex widgetIndex, in
{
auto& scroll = w.scrolls[scroll_id];
scroll.flags |= VSCROLLBAR_UP_PRESSED;
if (scroll.v_top >= 3)
scroll.v_top -= 3;
if (scroll.contentOffsetY >= 3)
scroll.contentOffsetY -= 3;
WidgetScrollUpdateThumbs(w, widgetIndex);
WidgetInvalidateByNumber(w.classification, w.number, widgetIndex);
}
@@ -898,16 +898,16 @@ static void InputScrollPartUpdateVBottom(WindowBase& w, WidgetIndex widgetIndex,
{
auto& scroll = w.scrolls[scroll_id];
scroll.flags |= VSCROLLBAR_DOWN_PRESSED;
scroll.v_top += 3;
scroll.contentOffsetY += 3;
int32_t newTop = widget.height() - 1;
if (scroll.flags & HSCROLLBAR_VISIBLE)
newTop -= kScrollBarWidth + 1;
newTop *= -1;
newTop += scroll.v_bottom;
newTop += scroll.contentHeight;
if (newTop < 0)
newTop = 0;
if (scroll.v_top > newTop)
scroll.v_top = newTop;
if (scroll.contentOffsetY > newTop)
scroll.contentOffsetY = newTop;
WidgetScrollUpdateThumbs(w, widgetIndex);
WidgetInvalidateByNumber(w.classification, w.number, widgetIndex);
}