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

(svn r21061) [1.0] -Backport from trunk: 

- Fix: Missing default values for the custom town number in the world generation options (r21034)
- Fix: Dropdown menu glitched in small screenshots, when issueing them from the menu (r21031)
release/1.0
rubidium 2010-10-31 13:54:09 +00:00
parent 29c82b89bf
commit dd6faa65e9
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ai/api/ai_changelog.hpp
View File

@ -14,6 +14,10 @@
* functions may still be available if you return an older API version * functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut. * in GetAPIVersion() in info.nut.
* *
* \b 1.0.5
*
* No changes
*
* \b 1.0.4 * \b 1.0.4
* *
* No changes * No changes

1
src/genworld_gui.cpp
View File

@ -743,6 +743,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
switch (this->widget_id) { switch (this->widget_id) {
case GLAND_START_DATE_TEXT: value = DEF_START_YEAR; break; case GLAND_START_DATE_TEXT: value = DEF_START_YEAR; break;
case GLAND_SNOW_LEVEL_TEXT: value = DEF_SNOWLINE_HEIGHT; break; case GLAND_SNOW_LEVEL_TEXT: value = DEF_SNOWLINE_HEIGHT; break;
case GLAND_TOWN_PULLDOWN: value = 1; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }
} }

8
src/widgets/dropdown.cpp
View File

@ -281,8 +281,10 @@ 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. */ /* Make the dropdown "invisible", so it doesn't affect new window placement.
* Also mark it dirty in case the callback deals with the screen. (e.g. screenshots). */
this->window_class = WC_INVALID; this->window_class = WC_INVALID;
this->SetDirty();
w2->OnDropdownSelect(this->parent_button, this->selected_index); w2->OnDropdownSelect(this->parent_button, this->selected_index);
delete this; delete this;
@ -296,8 +298,10 @@ 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. */ /* Make the dropdown "invisible", so it doesn't affect new window placement.
* Also mark it dirty in case the callback deals with the screen. (e.g. screenshots). */
this->window_class = WC_INVALID; this->window_class = WC_INVALID;
this->SetDirty();
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