From 8c1d277a77fbc063035119cb3b0fcc0ccb5c71fe Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Tue, 21 Jan 2020 14:51:37 +0000 Subject: [PATCH] GUI: Use a ScrollContainer for the Misc tab Fixes Trac #10961 --- gui/ThemeEngine.h | 2 +- gui/options.cpp | 5 ++++- gui/themes/default.inc | 10 ++++++++++ gui/themes/scummclassic.zip | Bin 159080 -> 159476 bytes gui/themes/scummclassic/THEMERC | 2 +- gui/themes/scummclassic/classic_layout.stx | 6 ++++++ .../scummclassic/classic_layout_lowres.stx | 6 ++++++ gui/themes/scummmodern.zip | Bin 289134 -> 289530 bytes gui/themes/scummmodern/THEMERC | 2 +- gui/themes/scummmodern/scummmodern_layout.stx | 6 ++++++ .../scummmodern/scummmodern_layout_lowres.stx | 6 ++++++ gui/themes/scummremastered.zip | Bin 287182 -> 287578 bytes gui/themes/scummremastered/THEMERC | 2 +- .../scummremastered/remastered_layout.stx | 6 ++++++ .../remastered_layout_lowres.stx | 6 ++++++ 15 files changed, 54 insertions(+), 5 deletions(-) diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 85750b74d13..e838063e547 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -37,7 +37,7 @@ #include "graphics/pixelformat.h" -#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.30" +#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.31" class OSystem; diff --git a/gui/options.cpp b/gui/options.cpp index 37a75b3f228..c51375458d9 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -1620,7 +1620,10 @@ void GlobalOptionsDialog::build() { tab->addTab(_("Misc"), "GlobalOptions_Misc"); else tab->addTab(_c("Misc", "lowres"), "GlobalOptions_Misc"); - addMiscControls(tab, "GlobalOptions_Misc.", g_system->getOverlayWidth() <= 320); + ScrollContainerWidget *miscContainer = new ScrollContainerWidget(tab, "GlobalOptions_Misc.Container", "GlobalOptions_Misc_Container"); + miscContainer->setTarget(this); + miscContainer->setBackgroundType(ThemeEngine::kWidgetBackgroundNo); + addMiscControls(miscContainer, "GlobalOptions_Misc_Container.", g_system->getOverlayWidth() <= 320); #ifdef USE_CLOUD #ifdef USE_LIBCURL diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 251126bba7e..60a81b5ed51 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -1417,6 +1417,11 @@ const char *defaultXML1 = "" "" "" "" +"" +"" +"" +"" +"" "" "" "" "" "" +"" +"" +"" +"" +"" "" "" "ij@f>I}nx&Cg{8`B;Ez z0yh8AUK!5EmS7s7xYOrC%4r6Ml+&9xH*d0;?x4yjFggFDz~sI~Dw97fRABMVEKZ*O za4)0eWVt82VBTcMC;poo4t(zAl?57*yYv6FU&k33er<2?V_ZhG0h1k8x=lad#u&E! zZZ{)i7ca=ktlPMq1h^R(1g0A(GD%MC;M*=F#w5rM_QiH}MW!#@U~g=f*JZlE0}=gf z$z&k_Vd{G^ZQzF}cpS+jEx-))=yb*`CL<1z*;b;DCQq-=ViKDkn8l<9)-k<0i^&13 zVfua$3luQZnX{QJ(E?_=S2mN80*YUO{*?p=ID}ZzsP8|0PBxReB8oSFUJ*x8l_1VE z{i7(8#PmPeOb`!D=gDD`VqU5Q78jmwlfxtkaZw;he6Aiu+{#=pEjc;Bn~_O`84}ST zdmieo-^3xnzyQKxDE1UuGcjbO=9DEF8clzj%_I%+?k$j!YrUDK+j%jGPhXz}bOI<< YOqa`Ll444Xo^F-Pq`_8~%>*X1^FA!x^-t2eqbuX_bQ1+2YZUzPr7Dv%?MRa<8 zE|aPPNLBfchLeYZDnJ-jm89bIEkIQeXWq?al426no&FQ1@1frMO&kIY3?M9qV)|3d z>2`TcDw-hEryQR2v4Nj~0fbRiDS9z6WTfVlB^eq`-Xm39x<2WC9uw02J<_tpET3 diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC index 63a24a100e0..4aec10176c6 100644 --- a/gui/themes/scummclassic/THEMERC +++ b/gui/themes/scummclassic/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.30:ScummVM Classic Theme:No Author] +[SCUMMVM_STX0.8.31:ScummVM Classic Theme:No Author] diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index de2d6864390..7e9c2c0f243 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -549,6 +549,12 @@ + + + + + + + + + + + + +TK&Pt``f~h@h^c1dO zZF+kMLQtYWYVhF}83nzRKWL!@J(TG~FK!S-K~Z#P?p?u%24*;%^L^*L_uRRk-z5B4 zNU+Q02$BTz+4{tN-F^}xL)o(7+k-4HK7`yHO~*_)7#B*W$a^bW9I}V@W>Rh$LIqB3{js{ORaP_;lnRAW)l33<468IX+rri$C@w)c@T3$Cj z;E88-F~hm>4s-E0U)=Z-bP7Vy8IB*`93D${gntff9Pc%{oXqFj^Az5b_?r7%ZJQ@; z^R`;H8#1+IdtYkVk};Q<$!3wobWuV;W0FbAUU7eq<6xsC_t|={Ni%{V&5(w>;%Fh3 zmr)sR+JMra(%-3JBO0lPhAU&VN?vSH`dbKuY-3d<8 zl}{2|0R77UzZc0e(4!DrZuw6jmd#X4oW`h=xT^}k(qS88Rwz>ts;1su{(z>dfeZh#zdUj5g9lN2`X;Wik2K&?KkSUD IQGxP*0E%pHasU7T delta 1045 zcmex$Rq)*OW-w#(G-e|x>kQi-K8RS4D3BHH zG~a)-kBT5vEYT>62O_)QE`SBX5_XP)>MeAOhRR+DN`#7;hQ&ZxQzPS`vfoovpkncv zj@%GamXv(qhS)Zz;Q~}$L2m?9-I)ny0uXg<3oQirK#resc+$rPeg=jH{>cIh#V4;7 z<(vF_0@vp1jph6hbG{vrgz6E#2sNiU|H}6KD~u5k-)ukqi1D5?*x2oB)tK}lc5Q#4 z$z;k5He$P^E|Yl`pLn%Oz$$TJ|NJuy4Ebla$1P`CYB#-q7IVV%1AmybraySd#5!Ga zGxJ_Bcf0)yrm7x6X`r5|OuGAbon&ADVcF@4%b7&C-!EZ)Y6H=`U>!3=?{=Wx=pKkO zD(qRHfw}#f6ALsnx10L2K!bDptRR+HNa$?;9mkT&%nXdq>B&hfMqvHZXC|?jL0FfQ zSZp9H;bayE2rC@K0>$X`*>JJ@$t)%iS@9GWD+ntz1t!*;!eR;$JC?#?4PmjS!enhz zSu7x8m8mRt5Z3Ng7Dq5^S{jf6w#*g80!7*Mt~8iK52V2y#gYzVd4O189X)Wd3+XT& zY#A_?O$N-`iVPM@h{;xlq*Jvt?l@PE9OI&d^KBEeP;tWD;S9WG;}tX;~~%Og4_w zWwKZ#H9-QAT?$z+g9K3wn(YfTs3gB2sU&au!c-QqXpnLXUL_VY9-zHI%!{I&ArPp% kJhLP@1E>L;)irzk?!#;nM$wuWJN + + + + + + + + + + + + vB!MI~4Ns7e74$(^Zy3TfE$d5x=7+x5x%ZqqD1-)Q{O`rmPr%fmH1@8gIq zjpe0|7jSY!9;dR3-}6SUrN8GD1HFr+cTrQr#wLsFn$>c}fXrrzN0}@6ZW65s=zd7# z;1O}OJ7wByl`ihs9m|gjLVlFI7!xP#Sc-^g_=X0ZhcnGRLA((`S&Vc;=oZf06wPF7 zRcsvA6I$Kk%N^@q5CnOp3j*%&Lk79liee@I@$qLMGp0T-@yJ(X!YgZ{5zjwDjWQ+U zhHv5lT)HkgSoF$6q{l0tMXi!T=wtLcd%H>-@a-m3g}_gPXe)pp2kANq9=5&YLluM& zqOXsOoM2Jvai!sv$+N*U$2D9JYhcgrMSAw27XV~jRkP{b(Pt!njdurlqg z8;TjN#G{58#iuyw zeQMuI9~82@As-x9?gD=6gOY!)0yg@=nz_vZD_@lScmJxs4Y&KjoG5o4FlnFQTsQ10 zispmR6AE+(n{w*fIwgljG$8gJ%6XG}VrH9G5ag8<_mbTX7vn8I7!^0?U}g&*r*4UZ zC#YMvqZ2=OgOSaBIskj^KTlEpQgb-iR2OdFu2J9I*)6sVWIg9z=d5VX@)MZ@J0EYYjYavEP=0 zdC5bi9Mz7GC8Ofci%iaCzvGJDt_9Y$kkEi_vxSv}Pc@nWdz>#8p)31h6-$U_!Ey`5 zfezEpZj0-7r*pA=P7vDX*mO)BcF@7SB#)+y5C^TyB3A0WM>f&u2zg3fzr+H%x-1&l z=(5<_XEOCzTsOtS=aaL7FgeQ#TF9DRQ!_>Vx(~}Q?FYUOR#pLgUF_Cj;QL~~kAe^9 zXa0I9k*hd<;%XP^nEu*HxsZ(P}U3 zL)7hsazsxyxNlx4LC)%f3PfR_t{C(|DRLiu;6Rk)hblxN6{&v;y}!Y&`t_FcPU#(- z-9RHM(iC46q>a%rI(CVE_bX%6$&i7@O|othll2CcWGKUEMgR_=i4*|)Kc`2B15mOf z{!9cRTe|}IxqGFqnb18gWE;&0g2ApXsn=?FWFvy0zFXpQt85@#Xbg0O!n=blZLZn` zF_qwj(v~X+Axn&v(P$7dtt#Wby8WE)WR7!MKd3lG&bI|4t#n$3bV*GwHRgiNpcGbK oV_bUZh?3sf6bXeD!T)MUr;dHrD{YOFzB)mRLa;Njzzquj7YWH?LI3~& diff --git a/gui/themes/scummremastered/THEMERC b/gui/themes/scummremastered/THEMERC index e2d57b1398c..3b6a6d45d53 100644 --- a/gui/themes/scummremastered/THEMERC +++ b/gui/themes/scummremastered/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.30:ScummVM Modern Theme Remastered:No Author] +[SCUMMVM_STX0.8.31:ScummVM Modern Theme Remastered:No Author] diff --git a/gui/themes/scummremastered/remastered_layout.stx b/gui/themes/scummremastered/remastered_layout.stx index 782c2b14ba4..4e62314f4d5 100644 --- a/gui/themes/scummremastered/remastered_layout.stx +++ b/gui/themes/scummremastered/remastered_layout.stx @@ -563,6 +563,12 @@ + + + + + + + + + + + +