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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/cargotype.h
#	src/core/CMakeLists.txt
#	src/core/span_type.hpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/misc/endian_buffer.hpp
#	src/misc_gui.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/string_func.h
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
This commit is contained in:
Jonathan G Rennison
2024-01-25 18:37:23 +00:00
parent c320a3fd7f 28ef5146ba
commit 822ecae85d
49 changed files with 127 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/misc_gui.cpp
View File

@@ -1242,10 +1242,7 @@ struct QueryWindow : public Window {
if (!this->precomposed) this->message_str = GetString(this->message);
Dimension d = GetStringMultiLineBoundingBox(this->message_str.c_str(), *size);
d.width += WidgetDimensions::scaled.frametext.Horizontal();
d.height += WidgetDimensions::scaled.framerect.Vertical();
*size = d;
*size = GetStringMultiLineBoundingBox(this->message_str, *size);
}
void DrawWidget(const Rect &r, WidgetID widget) const override
@@ -1254,8 +1251,7 @@ struct QueryWindow : public Window {
if (!this->precomposed) this->message_str = GetString(this->message);
DrawStringMultiLine(r.Shrink(WidgetDimensions::scaled.frametext, WidgetDimensions::scaled.framerect),
this->message_str, TC_FROMSTRING, SA_CENTER);
DrawStringMultiLine(r, this->message_str, TC_FROMSTRING, SA_CENTER);
}
void OnClick([[maybe_unused]] Point pt, WidgetID widget, [[maybe_unused]] int click_count) override