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

Window: Use window token to hold reference to dropdown window's parent

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-12-28 02:25:21 +00:00
parent ea1ba56ec4
commit 88cf1f4fc5
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/widgets/dropdown.cpp
View File

@@ -39,8 +39,7 @@ static WindowDesc _dropdown_desc(__FILE__, __LINE__,
/** Drop-down menu window */ /** Drop-down menu window */
struct DropdownWindow : Window { struct DropdownWindow : Window {
WindowClass parent_wnd_class; ///< Parent window class. WindowToken parent_wnd_token; ///< Parent window token.
WindowNumber parent_wnd_num; ///< Parent window number.
int parent_button; ///< Parent widget number where the window is dropped from. int parent_button; ///< Parent widget number where the window is dropped from.
Rect wi_rect; ///< Rect of the button that opened the dropdown. Rect wi_rect; ///< Rect of the button that opened the dropdown.
const DropDownList list; ///< List with dropdown menu items. const DropDownList list; ///< List with dropdown menu items.
@@ -77,8 +76,7 @@ struct DropdownWindow : Window {
{ {
assert(!this->list.empty()); assert(!this->list.empty());
this->parent_wnd_class = parent->window_class; this->parent_wnd_token = parent->GetWindowToken();
this->parent_wnd_num = parent->window_number;
this->CreateNestedTree(); this->CreateNestedTree();
@@ -100,7 +98,7 @@ struct DropdownWindow : Window {
this->SetDirty(); this->SetDirty();
this->Window::Close(); this->Window::Close();
Window *w2 = FindWindowById(this->parent_wnd_class, this->parent_wnd_num); Window *w2 = FindWindowByToken(this->parent_wnd_token);
if (w2 != nullptr) { if (w2 != nullptr) {
Point pt = _cursor.pos; Point pt = _cursor.pos;
pt.x -= w2->left; pt.x -= w2->left;
@@ -267,7 +265,7 @@ struct DropdownWindow : Window {
virtual void OnMouseLoop() override virtual void OnMouseLoop() override
{ {
Window *w2 = FindWindowById(this->parent_wnd_class, this->parent_wnd_num); Window *w2 = FindWindowByToken(this->parent_wnd_token);
if (w2 == nullptr) { if (w2 == nullptr) {
this->Close(); this->Close();
return; return;
@@ -318,7 +316,7 @@ struct DropdownWindow : Window {
virtual void OnFocus(Window *previously_focused_window) override virtual void OnFocus(Window *previously_focused_window) override
{ {
if (this->sync_parent_focus & DDSF_RECV_FOCUS) { if (this->sync_parent_focus & DDSF_RECV_FOCUS) {
Window *parent = FindWindowById(this->parent_wnd_class, this->parent_wnd_num); Window *parent = FindWindowByToken(this->parent_wnd_token);
if (parent) parent->OnFocus(previously_focused_window); if (parent) parent->OnFocus(previously_focused_window);
} }
} }
@@ -326,7 +324,7 @@ struct DropdownWindow : Window {
virtual void OnFocusLost(bool closing, Window *newly_focused_window) override virtual void OnFocusLost(bool closing, Window *newly_focused_window) override
{ {
if (this->sync_parent_focus & DDSF_LOST_FOCUS) { if (this->sync_parent_focus & DDSF_LOST_FOCUS) {
Window *parent = FindWindowById(this->parent_wnd_class, this->parent_wnd_num); Window *parent = FindWindowByToken(this->parent_wnd_token);
if (parent) parent->OnFocusLost(false, newly_focused_window); if (parent) parent->OnFocusLost(false, newly_focused_window);
} }
} }
@@ -438,8 +436,7 @@ int HideDropDownMenu(Window *pw)
DropdownWindow *dw = dynamic_cast<DropdownWindow*>(w); DropdownWindow *dw = dynamic_cast<DropdownWindow*>(w);
assert(dw != nullptr); assert(dw != nullptr);
if (pw->window_class == dw->parent_wnd_class && if (pw->GetWindowToken() == dw->parent_wnd_token) {
pw->window_number == dw->parent_wnd_num) {
int parent_button = dw->parent_button; int parent_button = dw->parent_button;
dw->Close(); dw->Close();
return parent_button; return parent_button;
@@ -453,6 +450,12 @@ void GetParentWindowInfo(Window *w, WindowClass &parent_wc, WindowNumber &parent
{ {
DropdownWindow *dw = dynamic_cast<DropdownWindow*>(w); DropdownWindow *dw = dynamic_cast<DropdownWindow*>(w);
assert(dw != nullptr); assert(dw != nullptr);
parent_wc = dw->parent_wnd_class; Window *parent = FindWindowByToken(dw->parent_wnd_token);
parent_wn = dw->parent_wnd_num; if (parent != nullptr) {
parent_wc = parent->window_class;
parent_wn = parent->window_number;
} else {
parent_wc = WC_INVALID;
parent_wn = 0;
}
} }