mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r19883) -Fix [FS#3812]: dropdowns did affect positioning of new windows because they were not yet removed when the new windows were positioned

release/1.1
rubidium 2010-05-22 19:04:56 +00:00
parent eb5852f5f5
commit 5e4ec72ce6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/dropdown.cpp
View File

@ -281,6 +281,9 @@ struct DropdownWindow : Window {
} }
if (this->click_delay != 0 && --this->click_delay == 0) { if (this->click_delay != 0 && --this->click_delay == 0) {
/* Make the dropdown "invisible", so it doesn't affect new window placement. */
this->window_class = WC_INVALID;
w2->OnDropdownSelect(this->parent_button, this->selected_index); w2->OnDropdownSelect(this->parent_button, this->selected_index);
delete this; delete this;
return; return;
@ -293,6 +296,9 @@ struct DropdownWindow : Window {
this->drag_mode = false; this->drag_mode = false;
if (!this->GetDropDownItem(item)) { if (!this->GetDropDownItem(item)) {
if (this->instant_close) { if (this->instant_close) {
/* Make the dropdown "invisible", so it doesn't affect new window placement. */
this->window_class = WC_INVALID;
if (GetWidgetFromPos(w2, _cursor.pos.x - w2->left, _cursor.pos.y - w2->top) == this->parent_button) { if (GetWidgetFromPos(w2, _cursor.pos.x - w2->left, _cursor.pos.y - w2->top) == this->parent_button) {
/* Send event for selected option if we're still /* Send event for selected option if we're still
* on the parent button of the list. */ * on the parent button of the list. */