mirror of https://github.com/OpenTTD/OpenTTD
Cleanup: Call SetMinimalSize instead of setting min_y directly.
parent
f5569763c9
commit
03a43b8247
|
@ -2268,7 +2268,8 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint32 data,
|
|||
case WWT_CAPTION:
|
||||
this->SetFill(1, 0);
|
||||
this->SetResize(1, 0);
|
||||
this->min_y = WD_CAPTION_HEIGHT;
|
||||
this->SetMinimalSize(0, WD_CAPTION_HEIGHT);
|
||||
this->SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM, FS_NORMAL);
|
||||
this->SetDataTip(data, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS);
|
||||
break;
|
||||
|
||||
|
@ -2310,7 +2311,7 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint32 data,
|
|||
|
||||
case WWT_DROPDOWN:
|
||||
this->SetFill(0, 0);
|
||||
this->min_y = WD_DROPDOWN_HEIGHT;
|
||||
this->SetMinimalSize(0, WD_DROPDOWN_HEIGHT);
|
||||
this->SetAlignment(SA_TOP | SA_LEFT);
|
||||
break;
|
||||
|
||||
|
|
|
@ -251,7 +251,7 @@ public:
|
|||
void SetFill(uint fill_x, uint fill_y);
|
||||
void SetResize(uint resize_x, uint resize_y);
|
||||
|
||||
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl);
|
||||
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl) override;
|
||||
|
||||
uint min_x; ///< Minimal horizontal size of only this widget.
|
||||
uint min_y; ///< Minimal vertical size of only this widget.
|
||||
|
@ -470,8 +470,8 @@ class NWidgetHorizontal : public NWidgetPIPContainer {
|
|||
public:
|
||||
NWidgetHorizontal(NWidContainerFlags flags = NC_NONE);
|
||||
|
||||
void SetupSmallestSize(Window *w, bool init_array);
|
||||
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl);
|
||||
void SetupSmallestSize(Window *w, bool init_array) override;
|
||||
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl) override;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -482,7 +482,7 @@ class NWidgetHorizontalLTR : public NWidgetHorizontal {
|
|||
public:
|
||||
NWidgetHorizontalLTR(NWidContainerFlags flags = NC_NONE);
|
||||
|
||||
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl);
|
||||
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl) override;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -493,8 +493,8 @@ class NWidgetVertical : public NWidgetPIPContainer {
|
|||
public:
|
||||
NWidgetVertical(NWidContainerFlags flags = NC_NONE);
|
||||
|
||||
void SetupSmallestSize(Window *w, bool init_array);
|
||||
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl);
|
||||
void SetupSmallestSize(Window *w, bool init_array) override;
|
||||
void AssignSizePosition(SizingType sizing, uint x, uint y, uint given_width, uint given_height, bool rtl) override;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue