diff options
| author | smatz <smatz@openttd.org> | 2009-07-13 12:00:56 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-07-13 12:00:56 +0000 |
| commit | 95c7993451a8d76b3bd3ec0c4844401e2a7729f0 (patch) | |
| tree | 54b24eef672132aeb397320b0ae95f8a9d0e896f | |
| parent | aa7bcb1259aef0c71523b9ccc945840edcf9c6b1 (diff) | |
| download | openttd-95c7993451a8d76b3bd3ec0c4844401e2a7729f0.tar.xz | |
(svn r16809) -Fix [FS#3021](r13096): automatic resizing of SelectCompanyLiveryWindow wasn't working as expected
| -rw-r--r-- | src/company_gui.cpp | 12 | ||||
| -rw-r--r-- | src/saveload/afterload.cpp | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/company_gui.cpp b/src/company_gui.cpp index e71d86585..e5d5bf5cc 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -559,7 +559,7 @@ public: this->livery_class = LC_OTHER; this->sel = 1; this->LowerWidget(SCLW_WIDGET_CLASS_GENERAL); - this->OnInvalidateData(_loaded_newgrf_features.has_2CC); + this->OnInvalidateData(); this->FindWindowPlacementAndResize(desc); } @@ -692,14 +692,8 @@ public: virtual void OnInvalidateData(int data = 0) { - static bool has2cc = true; - - if (has2cc == !!data) return; - - has2cc = !!data; - - int r = this->widget[has2cc ? SCLW_WIDGET_SEC_COL_DROPDOWN : SCLW_WIDGET_PRI_COL_DROPDOWN].right; - this->SetWidgetHiddenState(SCLW_WIDGET_SEC_COL_DROPDOWN, !has2cc); + int r = this->widget[_loaded_newgrf_features.has_2CC ? SCLW_WIDGET_SEC_COL_DROPDOWN : SCLW_WIDGET_PRI_COL_DROPDOWN].right; + this->SetWidgetHiddenState(SCLW_WIDGET_SEC_COL_DROPDOWN, !_loaded_newgrf_features.has_2CC); this->widget[SCLW_WIDGET_CAPTION].right = r; this->widget[SCLW_WIDGET_SPACER_CLASS].right = r; this->widget[SCLW_WIDGET_MATRIX].right = r; diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 407972f7b..a31dc4a44 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -1987,7 +1987,7 @@ void ReloadNewGRFData() /* Check and update house and town values */ UpdateHousesAndTowns(); /* Update livery selection windows */ - for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) InvalidateWindowData(WC_COMPANY_COLOUR, i, _loaded_newgrf_features.has_2CC); + for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) InvalidateWindowData(WC_COMPANY_COLOUR, i); /* redraw the whole screen */ MarkWholeScreenDirty(); CheckTrainsLengths(); |