miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed less used sizing types

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-05-07 22:38:44 +03:00
parent e80df6ae8e
commit 1efdce0358
5 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widget.cpp
+2 -10
View File
@@ -845,7 +845,6 @@ void NWidgetResizeBase::SetMinimalSize(uint min_x, uint min_y)
uint min_size = 0;
switch (this->sizing_type) {
case NWST_NONE:
case NWST_OVERRIDE:
min_size = 0;
break;
case NWST_BUTTON:
@@ -2411,7 +2410,7 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint32 data,
this->SetMinimalSize(8, 8);
break;
default:
this->sizing_type = NWST_OVERRIDE;
this->sizing_type = NWST_NONE;
}
}
@@ -2510,7 +2509,7 @@ void NWidgetLeaf::SetupSmallestSize(Window *w, bool init_array)
this->type == WWT_DEFSIZEBOX || this->type == WWT_CLOSEBOX || this->type == WWT_DEBUGBOX)) {
static const Dimension extra = {0, 0};
padding = &extra;
this->sizing_type = NWST_OVERRIDE;
this->sizing_type = NWST_NONE;
size = extra;
fill = extra;
resize = extra;
@@ -3245,17 +3244,10 @@ uint GetMinSizing(NWidSizingType type, uint min_1)
uint min_sizing;
switch (type) {
case NWST_NONE:
case NWST_OVERRIDE:
return min_1;
case NWST_BUTTON:
min_sizing = _settings_client.gui.min_button;
break;
case NWST_KEYBOARD:
min_sizing = 2 * _settings_client.gui.min_button;
break;
case NWST_WINDOW_LENGTH:
min_sizing = 8 * _settings_client.gui.min_button;
break;
default: NOT_REACHED();
}
min_sizing = RescaleFrom854x480(min_sizing);