Use RemoveViewport helper function (#13104)

This commit is contained in:
Duncan 2020-10-06 10:27:56 +01:00 committed by GitHub
parent 74d4182c95
commit eb3f3edc1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 58 deletions

View File

@ -1312,11 +1312,7 @@ static void window_finances_set_page(rct_window* w, int32_t page)
{
w->page = page;
w->frame_no = 0;
if (w->viewport != nullptr)
{
w->viewport->width = 0;
w->viewport = nullptr;
}
w->RemoveViewport();
w->enabled_widgets = WindowFinancesPageEnabledWidgets[page];
w->hold_down_widgets = WindowFinancesPageHoldDownWidgets[page];

View File

@ -642,12 +642,7 @@ void window_guest_set_page(rct_window* w, int32_t page)
w->no_list_items = 0;
w->selected_list_item = -1;
rct_viewport* viewport = w->viewport;
w->viewport = nullptr;
if (viewport)
{
viewport->width = 0;
}
w->RemoveViewport();
w->enabled_widgets = window_guest_page_enabled_widgets[page];
w->hold_down_widgets = 0;
@ -700,8 +695,7 @@ void window_guest_viewport_init(rct_window* w)
origViewportFlags = w->viewport->flags;
reCreateViewport = true;
w->viewport->width = 0;
w->viewport = nullptr;
w->RemoveViewport();
}
window_event_invalidate_call(w);

View File

@ -1262,11 +1262,7 @@ static void window_mapgen_set_page(rct_window* w, int32_t page)
{
w->page = page;
w->frame_no = 0;
if (w->viewport != nullptr)
{
w->viewport->width = 0;
w->viewport = nullptr;
}
w->RemoveViewport();
w->enabled_widgets = PageEnabledWidgets[page];
w->hold_down_widgets = HoldDownWidgets[page];

View File

@ -740,7 +740,6 @@ static void window_park_init_viewport(rct_window* w)
{
int32_t x, y, z, r, xy, zr, viewportFlags;
x = y = z = r = xy = zr = 0;
rct_viewport* viewport;
if (w->page != WINDOW_PARK_PAGE_ENTRANCE)
return;
@ -763,10 +762,8 @@ static void window_park_init_viewport(rct_window* w)
}
else
{
viewport = w->viewport;
w->viewport = nullptr;
viewportFlags = viewport->flags;
viewport->width = 0;
viewportFlags = w->viewport->flags;
w->RemoveViewport();
}
// Call invalidate event
@ -1659,11 +1656,7 @@ static void window_park_set_page(rct_window* w, int32_t page)
w->page = page;
w->frame_no = 0;
w->var_492 = 0;
if (w->viewport != nullptr)
{
w->viewport->width = 0;
w->viewport = nullptr;
}
w->RemoveViewport();
w->enabled_widgets = window_park_page_enabled_widgets[page];
w->hold_down_widgets = window_park_page_hold_down_widgets[page];

View File

@ -561,11 +561,7 @@ static void window_player_set_page(rct_window* w, int32_t page)
}
else
{
if (w->viewport != nullptr)
{
w->viewport->width = 0;
w->viewport = nullptr;
}
w->RemoveViewport();
}
}

View File

@ -588,11 +588,7 @@ static void window_research_set_page(rct_window* w, int32_t page)
{
w->page = page;
w->frame_no = 0;
if (w->viewport != nullptr)
{
w->viewport->width = 0;
w->viewport = nullptr;
}
w->RemoveViewport();
w->enabled_widgets = window_research_page_enabled_widgets[page];
w->hold_down_widgets = 0;

View File

@ -1523,11 +1523,7 @@ static void window_ride_set_page(rct_window* w, int32_t page)
// I've removed it if (page == WINDOW_RIDE_PAGE_VEHICLE) { ride_update_max_vehicles(ride);
//}
if (w->viewport != nullptr)
{
w->viewport->width = 0;
w->viewport = nullptr;
}
w->RemoveViewport();
w->enabled_widgets = window_ride_page_enabled_widgets[page];
w->hold_down_widgets = window_ride_page_hold_down_widgets[page];
@ -1671,8 +1667,7 @@ static void window_ride_init_viewport(rct_window* w)
return;
}
viewport_flags = w->viewport->flags;
w->viewport->width = 0;
w->viewport = nullptr;
w->RemoveViewport();
}
else if (gConfigGeneral.always_show_gridlines)
{

View File

@ -366,12 +366,7 @@ void window_staff_set_page(rct_window* w, int32_t page)
w->page = page;
w->frame_no = 0;
rct_viewport* viewport = w->viewport;
w->viewport = nullptr;
if (viewport)
{
viewport->width = 0;
}
w->RemoveViewport();
w->enabled_widgets = window_staff_page_enabled_widgets[page];
w->hold_down_widgets = 0;
@ -1373,8 +1368,7 @@ void window_staff_viewport_init(rct_window* w)
return;
viewport_flags = w->viewport->flags;
w->viewport->width = 0;
w->viewport = nullptr;
w->RemoveViewport();
}
else
{

View File

@ -220,11 +220,7 @@ void window_close(rct_window* w)
window_event_close_call(window.get());
// Remove viewport
if (window->viewport != nullptr)
{
window->viewport->width = 0;
window->viewport = nullptr;
}
window->RemoveViewport();
// Invalidate the window (area)
window->Invalidate();