|
|
|
@ -1447,8 +1447,8 @@ void Window::FindWindowPlacementAndResize(int def_width, int def_height)
|
|
|
|
|
ResizeWindow(this, enlarge_x, enlarge_y);
|
|
|
|
|
/* ResizeWindow() calls this->OnResize(). */
|
|
|
|
|
} else {
|
|
|
|
|
/* Always call OnResize; that way the scrollbars and matrices get initialized. */
|
|
|
|
|
this->OnResize();
|
|
|
|
|
/* Schedule OnResize; that way the scrollbars and matrices get initialized. */
|
|
|
|
|
this->ScheduleResize();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int nx = this->left;
|
|
|
|
@ -2050,8 +2050,8 @@ void ResizeWindow(Window *w, int delta_x, int delta_y, bool clamp_to_screen)
|
|
|
|
|
|
|
|
|
|
EnsureVisibleCaption(w, w->left, w->top);
|
|
|
|
|
|
|
|
|
|
/* Always call OnResize to make sure everything is initialised correctly if it needs to be. */
|
|
|
|
|
w->OnResize();
|
|
|
|
|
/* Schedule OnResize to make sure everything is initialised correctly if it needs to be. */
|
|
|
|
|
w->ScheduleResize();
|
|
|
|
|
w->SetDirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -3054,6 +3054,7 @@ void UpdateWindows()
|
|
|
|
|
|
|
|
|
|
/* Process invalidations before anything else. */
|
|
|
|
|
for (Window *w : Window::Iterate()) {
|
|
|
|
|
w->ProcessScheduledResize();
|
|
|
|
|
w->ProcessScheduledInvalidations();
|
|
|
|
|
w->ProcessHighlightedInvalidations();
|
|
|
|
|
}
|
|
|
|
@ -3111,6 +3112,26 @@ void SetWindowClassesDirty(WindowClass cls)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Mark this window as resized and in need of OnResize() event.
|
|
|
|
|
*/
|
|
|
|
|
void Window::ScheduleResize()
|
|
|
|
|
{
|
|
|
|
|
this->scheduled_resize = true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Process scheduled OnResize() event.
|
|
|
|
|
*/
|
|
|
|
|
void Window::ProcessScheduledResize()
|
|
|
|
|
{
|
|
|
|
|
/* Sometimes OnResize() resizes the window again, in which case we can reprocess immediately. */
|
|
|
|
|
while (this->scheduled_resize) {
|
|
|
|
|
this->scheduled_resize = false;
|
|
|
|
|
this->OnResize();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Mark this window's data as invalid (in need of re-computing)
|
|
|
|
|
* @param data The data to invalidate with
|
|
|
|
|