dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: use iterators instead of 'subranges' when iterating from a specific window.

Browse Source 
Using iterators makes it easier to include or exclude the start window in the iteration.
This commit is contained in:
frosch
2021-05-09 16:42:36 +02:00
committed by frosch
parent aba239479b
commit 22567a1f43
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/window.cpp
View File

@@ -896,7 +896,10 @@ static bool MayBeShown(const Window *w)
*/
static void DrawOverlappedWindow(Window *w, int left, int top, int right, int bottom)
{
for (const Window *v : Window::IterateFromBack(w->z_front)) {
Window::IteratorToFront it(w);
++it;
for (; !it.IsEnd(); ++it) {
const Window *v = *it;
if (MayBeShown(v) &&
right > v->left &&
bottom > v->top &&
@@ -2530,7 +2533,10 @@ static bool MaybeBringWindowToFront(Window *w)
w_height = w->unshaded_size.height;
}
for (Window *u : Window::IterateFromBack(w->z_front)) {
Window::IteratorToFront it(w);
++it;
for (; !it.IsEnd(); ++it) {
Window *u = *it;
/* A modal child will prevent the activation of the parent window */
if (u->parent == w && (u->window_desc->flags & WDF_MODAL)) {
u->SetWhiteBorder();