thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Moved default layout spacing to themes

Browse source
This commit is contained in:
Eugene Sandulenko 2021-04-03 17:18:02 +02:00
parent 3516dc2445
commit c5fceb9899
7 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gui/ThemeEval.cpp
View file

@ -139,13 +139,11 @@ ThemeEval &ThemeEval::addDialog(const Common::String &name, const Common::String
return *this;
}
#define SCALEVALUE(val) (val > 0 ? val * _scaleFactor : val)
ThemeEval &ThemeEval::addLayout(ThemeLayout::LayoutType type, int spacing, ThemeLayout::ItemAlign itemAlign) {
ThemeLayout *layout = nullptr;
if (spacing == -1)
spacing = getVar("Globals.Layout.Spacing", SCALEVALUE(4));
spacing = getVar("Globals.Layout.Spacing");
layout = new ThemeLayoutStacked(_curLayout.top(), type, spacing, itemAlign);
@ -171,6 +169,8 @@ ThemeEval &ThemeEval::addSpace(int size) {
return *this;
}
#define SCALEVALUE(val) (val > 0 ? val * _scaleFactor : val)
ThemeEval &ThemeEval::addPadding(int16 l, int16 r, int16 t, int16 b) {
_curLayout.top()->setPadding(SCALEVALUE(l), SCALEVALUE(r), SCALEVALUE(t), SCALEVALUE(b));

2
gui/themes/residualvm/residualvm_layout.stx
View file

@ -34,6 +34,8 @@
<def var = 'TabWidget.TitleSpacing' value = '10' scalable = 'yes'/>
<def var = 'Layout.Spacing' value = '4' scalable = 'yes'/>
<def var = 'ListWidget.hlLeftPadding' value = '0'/>
<def var = 'ListWidget.hlRightPadding' value = '0'/>

2
gui/themes/residualvm/residualvm_layout_lowres.stx
View file

@ -29,6 +29,8 @@
<def var = 'TabWidget.TitleSpacing' value = '10' scalable = 'yes'/>
<def var = 'Layout.Spacing' value = '4' scalable = 'yes'/>
<def var = 'ShowLauncherLogo' value = '0'/>
<def var = 'ShowGlobalMenuLogo' value = '0'/>
<def var = 'ShowSearchPic' value = '0'/>

2
gui/themes/scummmodern/scummmodern_layout.stx
View file

@ -34,6 +34,8 @@
<def var = 'TabWidget.TitleSpacing' value = '10' scalable = 'yes'/>
<def var = 'Layout.Spacing' value = '4' scalable = 'yes'/>
<def var = 'ListWidget.hlLeftPadding' value = '0'/>
<def var = 'ListWidget.hlRightPadding' value = '0'/>

2
gui/themes/scummmodern/scummmodern_layout_lowres.stx
View file

@ -29,6 +29,8 @@
<def var = 'TabWidget.TitleSpacing' value = '10' scalable = 'yes'/>
<def var = 'Layout.Spacing' value = '4' scalable = 'yes'/>
<def var = 'ShowLauncherLogo' value = '0'/>
<def var = 'ShowGlobalMenuLogo' value = '0'/>
<def var = 'ShowSearchPic' value = '0'/>

2
gui/themes/scummremastered/remastered_layout.stx
View file

@ -34,6 +34,8 @@
<def var = 'TabWidget.TitleSpacing' value = '10' scalable = 'yes'/>
<def var = 'Layout.Spacing' value = '4' scalable = 'yes'/>
<def var = 'ListWidget.hlLeftPadding' value = '0'/>
<def var = 'ListWidget.hlRightPadding' value = '0'/>

2
gui/themes/scummremastered/remastered_layout_lowres.stx
View file

@ -29,6 +29,8 @@
<def var = 'TabWidget.TitleSpacing' value = '10' scalable = 'yes'/>
<def var = 'Layout.Spacing' value = '4' scalable = 'yes'/>
<def var = 'ShowLauncherLogo' value = '0'/>
<def var = 'ShowGlobalMenuLogo' value = '0'/>
<def var = 'ShowSearchPic' value = '0'/>