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

(svn r20907) -Fix [FS#4156-ish]: callback 15C's string didn't actually get drawn

Browse Source
This commit is contained in:
rubidium
2010-10-08 20:33:23 +00:00
parent ffdc88a5d6
commit 969e3a9e45
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/object_gui.cpp
View File

@@ -57,7 +57,7 @@ class BuildObjectWindow : public PickerWindowBase {
} }
public: public:
BuildObjectWindow(const WindowDesc *desc, Window *w) : PickerWindowBase(w) BuildObjectWindow(const WindowDesc *desc, Window *w) : PickerWindowBase(w), info_height(1)
{ {
this->CreateNestedTree(desc); this->CreateNestedTree(desc);
@@ -191,7 +191,7 @@ public:
/* Use all the available space left from where we stand up to the /* Use all the available space left from where we stand up to the
* end of the window. We ALSO enlarge the window if needed, so we * end of the window. We ALSO enlarge the window if needed, so we
* can 'go' wild with the bottom of the window. */ * can 'go' wild with the bottom of the window. */
int y = DrawStringMultiLine(r.left, r.right, r.top, UINT16_MAX, message); int y = DrawStringMultiLine(r.left, r.right, r.top, UINT16_MAX, message) - r.top;
StopTextRefStackUsage(); StopTextRefStackUsage();
if (y > this->info_height) { if (y > this->info_height) {
BuildObjectWindow *bow = const_cast<BuildObjectWindow *>(this); BuildObjectWindow *bow = const_cast<BuildObjectWindow *>(this);
@@ -305,7 +305,7 @@ static const NWidgetPart _nested_build_object_widgets[] = {
NWidget(WWT_PANEL, COLOUR_GREY, BOW_OBJECT_SPRITE), SetMinimalSize(130, 0), SetFill(1, 0), SetDataTip(0x0, STR_STATION_BUILD_RAILROAD_ORIENTATION_TOOLTIP), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, BOW_OBJECT_SPRITE), SetMinimalSize(130, 0), SetFill(1, 0), SetDataTip(0x0, STR_STATION_BUILD_RAILROAD_ORIENTATION_TOOLTIP), EndContainer(),
EndContainer(), EndContainer(),
NWidget(WWT_TEXT, COLOUR_DARK_GREEN, BOW_OBJECT_SIZE), SetDataTip(STR_OBJECT_BUILD_SIZE, STR_NULL), SetPadding(2, 5, 2, 5), NWidget(WWT_TEXT, COLOUR_DARK_GREEN, BOW_OBJECT_SIZE), SetDataTip(STR_OBJECT_BUILD_SIZE, STR_NULL), SetPadding(2, 5, 2, 5),
NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BOW_INFO), SetPadding(2, 5, 0, 5), NWidget(WWT_EMPTY, COLOUR_DARK_GREEN, BOW_INFO), SetPadding(2, 5, 0, 5),
EndContainer(), EndContainer(),
}; };