cpp/openttd-patchpack/source Changeset - r27623:94a2107d67c7

Changeset - r27623:94a2107d67c7

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

PeterN - 12 months ago 2023-06-20 19:34:05
peter1138@openttd.org

Fix #11043: Don't choose toolbar dropdown option if focus is lost. (#11044)

Since dropdown menus now get closed if they lose focus, 'instant close' dropdowns (i.e. the toolbar dropdowns) should no longer execute their action to avoid unintended actions.

1 file changed with 4 insertions and 1 deletions:

src/widgets/dropdown.cpp

0 comments (0 inline, 0 general)

src/widgets/dropdown.cpp

➞

Show inline comments

@@ @@ -190,25 +190,28 @@ struct DropdownWindow : Window { @@
 		Point pt = _cursor.pos;
 		pt.x -= this->parent->left;
 		pt.y -= this->parent->top;
 		this->parent->OnDropdownClose(pt, this->parent_button, this->selected_index, this->instant_close);
 		/* Set flag on parent widget to indicate that we have just closed. */
 		NWidgetCore *nwc = this->parent->GetWidget<NWidgetCore>(this->parent_button);
 		if (nwc != nullptr) SetBit(nwc->disp_flags, NDB_DROPDOWN_CLOSED);
+	}
 	void OnFocusLost(bool closing) override
+	{
 		if (!closing) this->Close();
 		if (!closing) {
 			this->instant_close = false;
 			this->Close();
+		}
+	}
 	Point OnInitialPosition(int16 sm_width, int16 sm_height, int window_number) override
+	{
 		return this->position;
+	}
 	/**
 	 * Find the dropdown item under the cursor.
 	 * @param[out] value Selected item, if function returns \c true.
 	 * @return Cursor points to a dropdown item.
 	 */

0 comments (0 inline, 0 general)