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

(svn r27146) -Fix: Make statusbar and chat-entry window use the same width as the toolbar. Otherwise they lack a size definition.

Browse Source
This commit is contained in:
frosch
2015-02-13 21:13:45 +00:00
parent 1ebd85c1cc
commit e113f5e4a1
6 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/toolbar_gui.cpp
View File

@@ -46,6 +46,7 @@
#include "game/game.hpp"
#include "goal_base.h"
#include "story_base.h"
#include "toolbar_gui.h"
#include "widgets/toolbar_widget.h"
@@ -56,6 +57,9 @@
#include "safeguards.h"
/** Width of the toolbar, shared by statusbar. */
uint _toolbar_width = 0;
RailType _last_built_railtype;
RoadType _last_built_roadtype;
@@ -1350,7 +1354,7 @@ public:
child_wid->current_x = child_wid->smallest_x;
}
}
w->window_desc->default_width = nbuttons * this->smallest_x;
_toolbar_width = nbuttons * this->smallest_x;
}
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl)
@@ -1526,7 +1530,7 @@ class NWidgetScenarioToolbarContainer : public NWidgetToolbarContainer {
assert(i < lengthof(this->panel_widths));
this->panel_widths[i++] = child_wid->current_x;
w->window_desc->default_width += child_wid->current_x;
_toolbar_width += child_wid->current_x;
}
}
@@ -1666,6 +1670,11 @@ struct MainToolbarWindow : Window {
DoZoomInOutWindow(ZOOM_NONE, this);
}
virtual void FindWindowPlacementAndResize(int def_width, int def_height)
{
Window::FindWindowPlacementAndResize(_toolbar_width, def_height);
}
virtual void OnPaint()
{
/* If spectator, disable all construction buttons
@@ -1900,7 +1909,7 @@ static const NWidgetPart _nested_toolbar_normal_widgets[] = {
};
static WindowDesc _toolb_normal_desc(
WDP_MANUAL, NULL, 640, 22,
WDP_MANUAL, NULL, 0, 0,
WC_MAIN_TOOLBAR, WC_NONE,
WDF_NO_FOCUS,
_nested_toolbar_normal_widgets, lengthof(_nested_toolbar_normal_widgets),
@@ -2211,7 +2220,7 @@ static const NWidgetPart _nested_toolb_scen_widgets[] = {
};
static WindowDesc _toolb_scen_desc(
WDP_MANUAL, NULL, 640, 22,
WDP_MANUAL, NULL, 0, 0,
WC_MAIN_TOOLBAR, WC_NONE,
WDF_NO_FOCUS,
_nested_toolb_scen_widgets, lengthof(_nested_toolb_scen_widgets),