Skip to content

Prevent some unnecessary window invalidations #24433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
May 22, 2025
Merged

Prevent some unnecessary window invalidations #24433

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0b5fb11
Remove unnecessary window OnResize calls
mixiate May 16, 2025
4864b65
Fix scenery window invalidating every frame unnecessarily
mixiate May 17, 2025
ab402a5
Prevent inventions window invalidating every frame
mixiate May 17, 2025
c37fc88
Prevent windows invalidating every frame if any button is pressed
mixiate May 17, 2025
a47ee3f
Prevent new ride window from invalidating on every frame
mixiate May 17, 2025
3c9136a
Prevent ride ratings from invalidating ride windows unnecessarily
mixiate May 17, 2025
7fcfef9
Fix ride window viewport focus on viewport rotate
mixiate May 18, 2025
5e51c89
Fix extra viewport invalidating every frame
mixiate May 18, 2025
03d31d1
Fix viewport invalidation offsetting position each loop iteration
mixiate May 18, 2025
0763536
Fix new ride window not invalidating on group ride change
mixiate May 18, 2025
98f62f2
Fix staff window viewport issues
mixiate May 18, 2025
b84caf8
Restore original extra viewport opening window size
mixiate May 18, 2025
6d8d593
Fix scenery window scrollbar thumb size on window expansion
mixiate May 18, 2025
1292afb
Fix plugin window viewports on open and prevent unnecessary invalid
mixiate May 19, 2025
a27d9cc
Prevent path window invalidating unnecessarily
mixiate May 20, 2025
12606f3
Simplify the code of a couple of viewport screen coord calculations
mixiate May 20, 2025
c394712
Add changelog entry for improving window invalidations
mixiate May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix staff window viewport issues
  • Loading branch information
@mixiate
mixiate committed May 22, 2025
commit 98f62f2e97a4bfdbe2f0e7327df1c1dff4c218a3
32 changes: 17 additions & 15 deletions src/openrct2-ui/windows/Staff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ namespace OpenRCT2::Ui::Windows

if (staff->AssignedStaffType == StaffType::Entertainer)
_availableCostumes = getAvailableCostumeStrings(AnimationPeepType::Entertainer);

ViewportInit();
}

void OnOpen() override
Expand Down Expand Up @@ -531,6 +533,14 @@ namespace OpenRCT2::Ui::Windows

widgets[WIDX_FIRE].left = width - 25;
widgets[WIDX_FIRE].right = width - 2;

if (viewport != nullptr)
{
const Widget& viewportWidget = widgets[WIDX_VIEWPORT];
viewport->pos = windowPos + ScreenCoordsXY{ viewportWidget.left + 1, viewportWidget.top + 1 };
viewport->width = widgets[WIDX_VIEWPORT].width() - 1;
viewport->height = widgets[WIDX_VIEWPORT].height() - 1;
}
}

void OverviewDraw(RenderTarget& rt)
Expand Down Expand Up @@ -605,21 +615,6 @@ namespace OpenRCT2::Ui::Windows
{
WindowSetResize(*this, { WW, WH }, { 500, 450 });

if (viewport != nullptr)
{
auto widget = widgets[WIDX_VIEWPORT];
auto newWidth = widget.width() - 1;
auto newHeight = widget.height() - 1;
viewport->pos = windowPos + ScreenCoordsXY{ widget.left + 1, widget.top + 1 };

// Update the viewport size
if (viewport->width != newWidth || viewport->height != newHeight)
{
viewport->width = newWidth;
viewport->height = newHeight;
}
}

ViewportInit();
}

Expand Down Expand Up @@ -648,6 +643,13 @@ namespace OpenRCT2::Ui::Windows
picked_peep_frame %= pickAnimLength * 4;

InvalidateWidget(WIDX_TAB_1);

const std::optional<Focus> tempFocus = staff->State != PeepState::Picked ? std::optional(Focus(staff->Id))
: std::nullopt;
if (focus != tempFocus)
{
ViewportInit();
}
}

void OverviewToolUpdate(WidgetIndex widgetIndex, const ScreenCoordsXY& screenCoords)
Expand Down