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/debug.cpp
#	src/lang/russian.txt
#	src/misc_gui.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_cmd.cpp
#	src/window_gui.h
This commit is contained in:
Jonathan G Rennison
2021-04-11 03:05:08 +01:00
parent 045de24c9c f9460c0c8b
commit 227041008f
52 changed files with 439 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/widget_type.h
View File

@@ -170,6 +170,16 @@ public:
virtual void FillDirtyWidgets(std::vector<NWidgetBase *> &dirty_widgets) = 0;
virtual void SetDirty(Window *w);
Rect GetCurrentRect() const
{
Rect r;
r.left = this->pos_x;
r.top = this->pos_y;
r.right = this->pos_x + this->current_x;
r.bottom = this->pos_y + this->current_y;
return r;
}
WidgetType type; ///< Type of the widget / nested widget.
WidgetBaseFlags base_flags; ///< Widget base flags
uint fill_x; ///< Horizontal fill stepsize (from initial size, \c 0 means not resizable).