miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Add constant for INVALID_WIDGET. (#14649)

Browse Source 
Replaces direct use of -1, making it easier to find.
This commit is contained in:
Peter Nelson
2025-09-21 22:47:04 +01:00
committed by dP
parent 18bf0e2b58
commit 1824e42246
19 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/window.cpp
View File

@@ -1824,7 +1824,7 @@ void Window::InitNested(WindowNumber window_number)
* Empty constructor, initialization has been moved to #InitNested() called from the constructor of the derived class.
* @param desc The description of the window.
*/
Window::Window(WindowDesc &desc) : window_desc(desc), scale(_gui_scale), mouse_capture_widget(-1)
Window::Window(WindowDesc &desc) : window_desc(desc), scale(_gui_scale), mouse_capture_widget(INVALID_WIDGET)
{
this->z_position = _z_windows.insert(_z_windows.end(), this);
}
@@ -1906,7 +1906,7 @@ static void DecreaseWindowCounters()
NWidgetScrollbar *sb = static_cast<NWidgetScrollbar*>(nwid);
if (sb->disp_flags.Any({NWidgetDisplayFlag::ScrollbarUp, NWidgetDisplayFlag::ScrollbarDown})) {
sb->disp_flags.Reset({NWidgetDisplayFlag::ScrollbarUp, NWidgetDisplayFlag::ScrollbarDown});
w->mouse_capture_widget = -1;
w->mouse_capture_widget = INVALID_WIDGET;
sb->SetDirty(w);
}
}
@@ -2416,7 +2416,7 @@ static EventState HandleActiveWidget()
/* Abort if no button is clicked any more. */
if (!_left_button_down) {
w->SetWidgetDirty(w->mouse_capture_widget);
w->mouse_capture_widget = -1;
w->mouse_capture_widget = INVALID_WIDGET;
return ES_HANDLED;
}