From 1a8875cde3b8498220b34aa25e6201e8e13f813a Mon Sep 17 00:00:00 2001 From: tkashkin Date: Wed, 10 Aug 2022 06:36:47 +0300 Subject: [PATCH] Settings: Family, Cloud, Web --- Adwaita/adw/colors.styles | 2 + Adwaita/adw/settingsdialog.styles | 45 -------- Adwaita/assets/focusring/12/bl.tga | Bin 0 -> 694 bytes Adwaita/assets/focusring/12/bl@2x.tga | Bin 0 -> 2722 bytes Adwaita/assets/focusring/12/br.tga | Bin 0 -> 694 bytes Adwaita/assets/focusring/12/br@2x.tga | Bin 0 -> 2722 bytes Adwaita/assets/focusring/12/tl.tga | Bin 0 -> 694 bytes Adwaita/assets/focusring/12/tl@2x.tga | Bin 0 -> 2722 bytes Adwaita/assets/focusring/12/tr.tga | Bin 0 -> 694 bytes Adwaita/assets/focusring/12/tr@2x.tga | Bin 0 -> 2722 bytes Adwaita/assets/focusring/6/bl.tga | Bin 0 -> 214 bytes Adwaita/assets/focusring/6/bl@2x.tga | Bin 0 -> 802 bytes Adwaita/assets/focusring/6/br.tga | Bin 0 -> 214 bytes Adwaita/assets/focusring/6/br@2x.tga | Bin 0 -> 802 bytes Adwaita/assets/focusring/6/tl.tga | Bin 0 -> 214 bytes Adwaita/assets/focusring/6/tl@2x.tga | Bin 0 -> 802 bytes Adwaita/assets/focusring/6/tr.tga | Bin 0 -> 214 bytes Adwaita/assets/focusring/6/tr@2x.tga | Bin 0 -> 802 bytes Adwaita/assets/icons/edit.tga | Bin 0 -> 1042 bytes Adwaita/assets/icons/edit@2x.tga | Bin 0 -> 4114 bytes Adwaita/public/UseOfflineMode.res | 1 + Adwaita/public/UseOfflineModeChosen.res | 1 + Adwaita/resource/layout/settingsdialog.layout | 42 ++++++++ .../layout/subpaneloptionsbrowser.layout | 98 ++++++++++++++++++ .../layout/subpaneloptionscloud.layout | 29 ++++++ .../layout/subpaneloptionsdownloads.layout | 21 +--- .../layout/subpaneloptionsfamily.layout | 85 +++++++++++++++ .../layout/subpaneloptionsingame.layout | 5 +- .../layout/subpaneloptionsshadercache.layout | 4 - Adwaita/resource/menus/steam.menu | 2 +- Adwaita/resource/styles/steam.styles | 70 +++++++++++++ 31 files changed, 335 insertions(+), 70 deletions(-) create mode 100644 Adwaita/assets/focusring/12/bl.tga create mode 100644 Adwaita/assets/focusring/12/bl@2x.tga create mode 100644 Adwaita/assets/focusring/12/br.tga create mode 100644 Adwaita/assets/focusring/12/br@2x.tga create mode 100644 Adwaita/assets/focusring/12/tl.tga create mode 100644 Adwaita/assets/focusring/12/tl@2x.tga create mode 100644 Adwaita/assets/focusring/12/tr.tga create mode 100644 Adwaita/assets/focusring/12/tr@2x.tga create mode 100644 Adwaita/assets/focusring/6/bl.tga create mode 100644 Adwaita/assets/focusring/6/bl@2x.tga create mode 100644 Adwaita/assets/focusring/6/br.tga create mode 100644 Adwaita/assets/focusring/6/br@2x.tga create mode 100644 Adwaita/assets/focusring/6/tl.tga create mode 100644 Adwaita/assets/focusring/6/tl@2x.tga create mode 100644 Adwaita/assets/focusring/6/tr.tga create mode 100644 Adwaita/assets/focusring/6/tr@2x.tga create mode 100644 Adwaita/assets/icons/edit.tga create mode 100644 Adwaita/assets/icons/edit@2x.tga create mode 100755 Adwaita/resource/layout/subpaneloptionsbrowser.layout create mode 100755 Adwaita/resource/layout/subpaneloptionscloud.layout create mode 100755 Adwaita/resource/layout/subpaneloptionsfamily.layout diff --git a/Adwaita/adw/colors.styles b/Adwaita/adw/colors.styles index 49820b0d..fa53ee45 100644 --- a/Adwaita/adw/colors.styles +++ b/Adwaita/adw/colors.styles @@ -52,5 +52,7 @@ colors.styles scrollbar="255 255 255 51" scrollbar_hover="255 255 255 102" scrollbar_active="255 255 255 153" + + focusring="120 174 237 128" } } \ No newline at end of file diff --git a/Adwaita/adw/settingsdialog.styles b/Adwaita/adw/settingsdialog.styles index 98502ee6..3ec583be 100644 --- a/Adwaita/adw/settingsdialog.styles +++ b/Adwaita/adw/settingsdialog.styles @@ -1,10 +1,5 @@ settingsdialog.styles { - colors - { - ListPanelItem.Tall=36 - } - styles { CDialogSettings @@ -42,46 +37,6 @@ settingsdialog.styles render_bg {} } - SettingsList - { - inset="12 -18 12 0" - bgcolor=none - selectedbgcolor="button_bg" - textcolor="button_fg" - padding-left=2 - font-family=basefont - font-size=16 - font-style=none - render_bg {} - render - { - 0="fill(x1-1, y0, x1, y1, border)" - } - } - - ListPanelColumnHeader - { - inset="0 0 0 0" - minimum-height=1 - bgcolor=none - render_bg {} - } - - ListPanelSectionHeader - { - inset="0 0 0 0" - minimum-height=1 - bgcolor=none - render_bg {} - } - - ListPanelInterior - { - inset="0 0 0 0" - bgcolor=none - render_bg {} - } - "CDialogSettings Page Button" { bgcolor="button_bg" diff --git a/Adwaita/assets/focusring/12/bl.tga b/Adwaita/assets/focusring/12/bl.tga new file mode 100644 index 0000000000000000000000000000000000000000..a79c869e99330a8bfff539c08b5f24a9515ecd08 GIT binary patch literal 694 zcmZQzU}As)UItzU1&!Bh%Nsx#CQ1zbYHei!NYDHE1p>sV2dR0rwju$f=gpc*4Py1Y zUR~}0((`szg$J>Ep06)g0Nb;!yyE`+1`cBN!Q2P3lUO~-cD-LuQdoF^-1us3Spl*7 zKz@0-rXqt>eIWB;`apV#^&iMSV3>g23A6L%nzDfR!0;vHW>C1m!xLmD5+)S3ueO#- Pyan0|(*Fh+hakNGYO01o literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/12/bl@2x.tga b/Adwaita/assets/focusring/12/bl@2x.tga new file mode 100644 index 0000000000000000000000000000000000000000..3c0e419a1046aa530adfbb642cd841b6cae29b0a GIT binary patch literal 2722 zcmcJRu?~VT5QZBkM@Qr2$mr!!1|G&r=b~$XU!?$tTs<(5}c~Y4xG~zr$~a+ z6zP_8-X>j3a9$LbbLyMkNpS4tIOm+^rZXuoAU0<`OT84)WU`oZtjYEg9DG0LVBMB7 z{)UDgOUMsCO@ejmX|g6wB)sR-MEQ&*Jb}2qI-#Fm^(Hh6c^dZCjw`@|r-yr2ie>Np ze&lkAyoUCMEsrY~pU?0i`eMkML6S4uk2_qC<+%4cpOoqLXZ=W{dp^VrCTjDhJ%)3J Fvp;e-%xM4s literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/12/br.tga b/Adwaita/assets/focusring/12/br.tga new file mode 100644 index 0000000000000000000000000000000000000000..fd230614d576fac92093c05d3906318a5d32d475 GIT binary patch literal 694 zcmZQzU}As)UItzU1q~RF82a_v@&*tlMlDFq`}G9^AoXw7l~)k2r(6M~=hfPZ1Y-5P zTwfLd((`szg$J>EUahSx0Nb;wRDu{iuUD5lkm4?w-$8nwuP;|1WCut+%uR3C67~nO z`qyhJGVafB;J{@ENDkzFP&|O#15yvtkFFjh_GV3`1~BYB;A%nP3glxmA8Z!LJR}T? XH+=pDsRj8Hr0(_latC~BVeSI}eoKa3 literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/12/br@2x.tga b/Adwaita/assets/focusring/12/br@2x.tga new file mode 100644 index 0000000000000000000000000000000000000000..99aa952bc7c6b5ae163921b0c081ea7bc5f0cfaa GIT binary patch literal 2722 zcmcJQF>k^!5QVKy9T_VoMn*=)j*N^QGcsl&Hcb4J?lexO{+>=%i4(+Mz>nypvx|g6 z&Pd3P5byK7cfKg~qUbYKQ#G5@ll0nJec)ededzss9$q;E`xG2^+`e&+vqheQbE)+# zT+AsYcGtQoyngPGy zqZH>}9hd`Be)XCE&ja3}=OpUDypQ{evT^nJ9=_f4Xaye}-64Gy|NqgmzmwUY&uM7hk96txXZ7hkq;qeDckt(#^OHWU Vq>p}WO0#MFdkGnh=^@hQ>lJR4%!L2| literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/12/tl.tga b/Adwaita/assets/focusring/12/tl.tga new file mode 100644 index 0000000000000000000000000000000000000000..9db476223201aa86f6a556d2ce1e2030f27335b3 GIT binary patch literal 694 zcmZQzU}As)UItzU1q~Pv7yW*Hxx(w!!&;9ug z96+@mFm-R%l~=q4@}I7$)VROCKmc9+d!X3sH5C~k^&qvc*Oxnh%s^KMR+ub zD*)+-$>E}5?jcq^IBcMPCB}S^z3}h>x*wN2ki}oEDwP2F8RRBpaeQo;Ki;e<3&5ui hSq|o|=fLXJ64@KcI?Q=$jHdpkugi+l&OEhUd8pq_jE!KH&uUudnH%QVWgT| zi4>ik*zeuFJD-iYGW<-;#7t*A)39M(j^AB%(>B%puBjh`TNXQKS9piwAH1CgSKoCT zTQg?L{*|Z4U!*Wo-*S0!@tN~np6&DM8v5|Qls#&*-$V^M16{PxzmvmHF?e*J|PeOKOHbpv?h1+!g<$ p+4s9^PrR3i2X|B)k5<2zzRDW7#MuOA91F(UeTL(bJp5hTegMo6%xVAt literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/12/tr.tga b/Adwaita/assets/focusring/12/tr.tga new file mode 100644 index 0000000000000000000000000000000000000000..4a40e92a902575636f4275d97d36749785d541f1 GIT binary patch literal 694 zcmZQzU}As)UItzU1&!Bh%NyRTE3bI9wju$DJzlLUm4K&q2z=>dt~ zUtb{b9H{2a`m%smYby(2W`OLyKfi$kpI(^U>-FUhFnzDrRAjsdnhBG`M}ySC?F8y0 z);?r?Aa~-k16dBF4-~E-w}SkPEQgQ%dNssMf6F;NX##-WIh_$GtPddNe`0qpP$<(hI@%^vJ3E#~3j%Vcr zProWB|Gm<)`5wYIVVB=>xMxdKcKM!#NN?f{Z|wYDMw zCI+KHX1!TgUI8{6s17C$qhGBrH2}*2^}k$G7VsX;{1Ea3WqYCvjXdO`I2^#uZN O)|UmmTvL$&k^=y1RzX() literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/6/bl@2x.tga b/Adwaita/assets/focusring/6/bl@2x.tga new file mode 100644 index 0000000000000000000000000000000000000000..a788b5dcc4dedec09c9ad7a9955524a335e0b8b0 GIT binary patch literal 802 zcmZQzU}As)J_bGp1&!Bh%Nvj}OqLM+W?gv&vcC883j_%10m;8yQ;~tJ@6DP@4Px}Y zT3g|Ptnclr3J+rRJzrn0fUFPX?)&o_IEc~vYHei!vfkJ0$|H!MISJX->xmQ zAVx2G_<+q>UG6|g@B8%y0_br9())5vSpY~5pZ-@^+zWF*NIxi!UacyXz-Go%pd2=P nVftY-HoYKsVT3UW=@H~^T>7!uhb{(68*hQ>3YfMMV157qp(5c` literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/6/br.tga b/Adwaita/assets/focusring/6/br.tga new file mode 100644 index 0000000000000000000000000000000000000000..ab4ca5bb08ed25cab1cdd7f9ba63b653b9041694 GIT binary patch literal 214 zcmZQzU}As)b_R9^1q~PvnSQ;tya9xf#X#)$>&q3ua_cHG(B)pPFAD(4y;)NhfGqcV zb-4prd|i3P`}G9^_vbfofXsQdwju#+7EsUIwPh9{Jup5@{j2p=1~9WgVz1U#7Q9|x L?f^0aCJv$j$XG#f literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/6/br@2x.tga b/Adwaita/assets/focusring/6/br@2x.tga new file mode 100644 index 0000000000000000000000000000000000000000..600b41da6bf622811403550d810b49df85d6d4ea GIT binary patch literal 802 zcmZQzU}As)J_bGp1q~RF5dC^>c>^*gq#h*yYE`KOvYt2V$}5P`_jFCA2C}|aYbz3n z(f4wFSpc%Wx2q~V2viQ3=z2h55ArLrT_FA&U|0jg*8?Pvt_Q>i$s_B*rUqFIWX`Mg rn0`W5gTY=?k%8_un4K7Efo=kYHKA|==>xgtCD81*K>raFryx54sq^7v literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/6/tl.tga b/Adwaita/assets/focusring/6/tl.tga new file mode 100644 index 0000000000000000000000000000000000000000..b41a4dcc249f622ed455a7a19a99ba7d8c78ccb1 GIT binary patch literal 214 zcmZQzU}As)b_R9^1q~PvMBks^!0~!@xx=fql?AWYmN&rUUahJ!c(bm&0we~*Ah{Q7 z%Pe60S8FR0p06)g0GaWAeSrX6{rYkTm^mQ&<@&M!ke)Yd$^wwZ!E$RVGC*=5bI|2r J_MnS{_y7VAK~n$# literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/6/tl@2x.tga b/Adwaita/assets/focusring/6/tl@2x.tga new file mode 100644 index 0000000000000000000000000000000000000000..53b722918736311ad3f28aded8bca3e76d3a11ae GIT binary patch literal 802 zcma)4p$>yE5N)QW$mApviJY9AoSdAT#6Zgwe=<*6`bj8EDd88^Thiq6){&7A?s4zk zyX#emorq5+GLaV%ZGBfOb7$0L*6QI0sb(X)ExxmL=}cP@58sq-wbg-YBbQ^;x&B$k zUN{e9uJgJrFi)83EMdMWPGLNI*Vo4s5C3s5iZTBSzX6Dm;d1~0 literal 0 HcmV?d00001 diff --git a/Adwaita/assets/focusring/6/tr.tga b/Adwaita/assets/focusring/6/tr.tga new file mode 100644 index 0000000000000000000000000000000000000000..d352a5a9880b4c719a50b57ac3903a795f74b47d GIT binary patch literal 214 zcmZQzU}As)b_R9^1&!Bh%Nt&=smOS_rYzw7`T_x%EQkinf#iYs&ARf6w`zE0jz&@xdXZ!$b698tF>hX=yD*l HVDIV`SAeO&M}zdC<5z3T3SOejMkoCP@M_l-T!XH^5$lWkA3DL;de{-usX9y zcxJ*?GVnz*XBG*J30KL$7s;GiBrqmiB?Dh1b7qmim~fR0e38tVMFL~ORWk5JGG}%t maDB3k4EAMuE`HZrxv<kA?(^iU`*xhG$Mik?(jO zD0Na!TH(03))BAcI5vn5(f)FN;AupU@HL=um(BwW&iRd4(o-r20Ap;IQ*j>>*vx_c zoJ;wT$R?j^OYkwyR?jWeJ6&`68EmG}{ z&L0c?3?dZSyM5=kh`GI`vSB{FF^EvrbH6Y*-owONYtu?P`Wn-i?qBv6mL%A(sol0E z?m5}i44aQ`-?uV*iyM1|Z*#!O@Fq~!zUH$d`~Yj4McIk`;_L*z2zw)6j2+>V+aoml IRh4z%1AvZx761SM literal 0 HcmV?d00001 diff --git a/Adwaita/public/UseOfflineMode.res b/Adwaita/public/UseOfflineMode.res index 3c9a2311..f7b1142a 100755 --- a/Adwaita/public/UseOfflineMode.res +++ b/Adwaita/public/UseOfflineMode.res @@ -35,6 +35,7 @@ UseOfflineModeChosen.res Button { + inset-left=10 render { 0="fill(x0, y0-1, x1, y0, border)" diff --git a/Adwaita/public/UseOfflineModeChosen.res b/Adwaita/public/UseOfflineModeChosen.res index 8d5a58b0..835ca6cd 100755 --- a/Adwaita/public/UseOfflineModeChosen.res +++ b/Adwaita/public/UseOfflineModeChosen.res @@ -24,6 +24,7 @@ UseOfflineModeChosen.res Button { + inset-left=10 render { 0="fill(x0, y0-1, x1+1, y0, border)" diff --git a/Adwaita/resource/layout/settingsdialog.layout b/Adwaita/resource/layout/settingsdialog.layout index 05c1a8e5..6cf2d7c4 100644 --- a/Adwaita/resource/layout/settingsdialog.layout +++ b/Adwaita/resource/layout/settingsdialog.layout @@ -1,5 +1,47 @@ settingsdialog.layout { + styles + { + SettingsList + { + inset="12 -18 12 0" + bgcolor=none + selectedbgcolor="button_bg" + textcolor="button_fg" + padding-left=2 + font-family=basefont + font-size=16 + font-style=none + render_bg {} + render + { + 0="fill(x1-1, y0, x1, y1, border)" + } + } + ListPanelColumnHeader + { + inset="0 0 0 0" + minimum-height=1 + bgcolor=none + render_bg {} + render {} + } + ListPanelSectionHeader + { + inset="0 0 0 0" + minimum-height=1 + bgcolor=none + render_bg {} + render {} + } + ListPanelInterior + { + inset="0 0 0 0" + bgcolor=none + render_bg {} + } + } + layout { place { control="frame_title" x=0 y=0 width=max height=48 } diff --git a/Adwaita/resource/layout/subpaneloptionsbrowser.layout b/Adwaita/resource/layout/subpaneloptionsbrowser.layout new file mode 100755 index 00000000..d3dd1a00 --- /dev/null +++ b/Adwaita/resource/layout/subpaneloptionsbrowser.layout @@ -0,0 +1,98 @@ +subpaneloptionsbrowser.layout +{ + styles + { + Label + { + font-size=12 + textcolor="button_disabled_fg" + } + + TextEntry + { + inset-left=9 + inset-right=9 + inset-top=6 + inset-bottom=-6 + render + { + 0="fill(x0, y1-1, x1, y1, headerbar_shade)" + 1="image(x1-28, y0+17, x1-12, y1-17, assets/icons/edit)" + } + render_bg + { + 0="fill(x0, y0+12, x1, y1, button_bg)" + 1="fill(x0+12, y0, x1-12, y0+12, button_bg)" + 2="image(x0, y0, x0+12, y0+12, assets/corners/12_w10/tl)" + 3="image(x1-12, y0, x1, y0+12, assets/corners/12_w10/tr)" + } + } + TextEntry:hover + { + render_bg + { + 0="fill(x0, y0+12, x1, y1, button_hover_bg)" + 1="fill(x0+12, y0, x1-12, y0+12, button_hover_bg)" + 2="image(x0, y0, x0+12, y0+12, assets/corners/12_w15/tl)" + 3="image(x1-12, y0, x1, y0+12, assets/corners/12_w15/tr)" + } + } + TextEntry:focus + { + render + { + 0="image(x0, y0, x0+13, y0+13, assets/focusring/12/tl)" + 1="image(x1-13, y0, x1, y0+13, assets/focusring/12/tr)" + 2="fill(x0+13, y0, x1-13, y0+2, focusring)" + 3="fill(x0, y0+13, x0+2, y1-2, focusring)" + 4="fill(x1-2, y0+13, x1, y1-2, focusring)" + 5="fill(x0, y1-2, x1, y1, focusring)" + } + } + + Button + { + bgcolor=none + render_bg + { + 0="fill(x0, y0, x1, y1-12, button_bg)" + 1="fill(x0+12, y1-12, x1-12, y1, button_bg)" + 2="image(x0, y1-12, x0+12, y1, assets/corners/12_w10/bl)" + 3="image(x1-12, y1-12, x1, y1, assets/corners/12_w10/br)" + } + } + Button:hover + { + bgcolor=none + render_bg + { + 0="fill(x0, y0, x1, y1-12, button_hover_bg)" + 1="fill(x0+12, y1-12, x1-12, y1, button_hover_bg)" + 2="image(x0, y1-12, x0+12, y1, assets/corners/12_w15/bl)" + 3="image(x1-12, y1-12, x1, y1, assets/corners/12_w15/br)" + } + } + Button:active + { + bgcolor=none + render_bg + { + 0="fill(x0, y0, x1, y1-12, button_active_bg)" + 1="fill(x0+12, y1-12, x1-12, y1, button_active_bg)" + 2="image(x0, y1-12, x0+12, y1, assets/corners/12_w30/bl)" + 3="image(x1-12, y1-12, x1, y1, assets/corners/12_w30/br)" + } + } + } + + layout + { + region { name="content" margin-top=16 margin-left=16 width=500 height=max } + + place { control="OverlayHomePage,ClientBrowserAuthHomePage,ClearAllBrowserDataButton" region="content" dir=down width=max height=50 } + place { control="OverlayHomePageLabel" region="content" start="OverlayHomePage" dir=down margin-left=12 margin-top=-43 margin-right=12 width=max } + + region { name="hidden" width=0 height=0 margin-left=-999 } + place { control="DescriptionLabel,Divider1" region="hidden" width=0 height=0 } + } +} diff --git a/Adwaita/resource/layout/subpaneloptionscloud.layout b/Adwaita/resource/layout/subpaneloptionscloud.layout new file mode 100755 index 00000000..881c70e2 --- /dev/null +++ b/Adwaita/resource/layout/subpaneloptionscloud.layout @@ -0,0 +1,29 @@ +subpaneloptionscloud.layout +{ + styles + { + CSubPanelOptionsCloud + { + render + { + 0="image(x0+196, y0+16, x0+208, y0+28, assets/corners/12_mask_window_bg/tl)" + 1="image(x1-32, y0+16, x1-20, y0+28, assets/corners/12_mask_window_bg/tr)" + 2="image(x0+196, y0+104, x0+208, y0+116, assets/corners/12_mask_window_bg/bl)" + 3="image(x1-32, y0+104, x1-20, y0+116, assets/corners/12_mask_window_bg/br)" + 4="fill(x0+196, y0+115, x1-20, y0+116, window_bg)" + } + } + + CheckButton + { + inset-top=84 + } + } + + layout + { + region { name="content" margin-top=16 margin-left=16 width=500 height=max } + place { control="EnableCloudCheck,EnableScreenshotsCheck" region="content" dir=down width=max height=50 } + place { control="SteamCloudInfo" region="content" start="EnableScreenshotsCheck" dir=down margin-top=16 width=max } + } +} diff --git a/Adwaita/resource/layout/subpaneloptionsdownloads.layout b/Adwaita/resource/layout/subpaneloptionsdownloads.layout index db323cb2..b55e81fc 100755 --- a/Adwaita/resource/layout/subpaneloptionsdownloads.layout +++ b/Adwaita/resource/layout/subpaneloptionsdownloads.layout @@ -33,7 +33,7 @@ subpaneloptionsdownloads.layout ComboBoxButton { - inset-left=-6 + inset-left=-4 render_bg {} } @@ -77,19 +77,6 @@ subpaneloptionsdownloads.layout 6="image(x1-6, y1-6, x1, y1, assets/corners/6_w30/br)" } } - ComboBox:focus - { - render - { - 0="fill(x0+6, y0, x1-6, y1, button_active_bg)" - 1="fill(x0, y0+6, x0+6, y1-6, button_active_bg)" - 2="fill(x1-6, y0+6, x1, y1-6, button_active_bg)" - 3="image(x0, y0, x0+6, y0+6, assets/corners/6_w30/tl)" - 4="image(x1-6, y0, x1, y0+6, assets/corners/6_w30/tr)" - 5="image(x0, y1-6, x0+6, y1, assets/corners/6_w30/bl)" - 6="image(x1-6, y1-6, x1, y1, assets/corners/6_w30/br)" - } - } ComboBox:disabled { render @@ -229,15 +216,15 @@ subpaneloptionsdownloads.layout place { control="ManageInstalledApps" region="content" start="LibrariesLabel" dir=down width=max height=50 } place { control="RegionLabel" region="content" start="ManageInstalledApps" dir=down width=max height=34 } - place { control="DownloadRegionCombo" region="content" start="RegionLabel" dir=down margin-top=8 margin-left=278 width=200 height=34 } + place { control="DownloadRegionCombo" region="content" start="RegionLabel" dir=down margin-top=8 margin-left=276 width=200 height=34 } place { control="RegionInfoLabel" region="content" start="RegionLabel" dir=down margin-top=8 margin-left=12 width=254 height=34 } place { control="RestrictionsLabel" region="content" start="RegionLabel" margin-top=50 dir=down width=max height=34 } place { control="AutoUpdateTimeRestrictCheckbox,ThrottleCheckbox" region="content" start="RestrictionsLabel" dir=down width=272 height=50 } - place { control="AutoUpdateTimeRestrictStart,AutoUpdateTimeRestrictEnd" region="content" start="AutoUpdateTimeRestrictCheckbox" align=right margin-top=7 margin-right=6 width=97 height=34 spacing=6 } + place { control="AutoUpdateTimeRestrictStart,AutoUpdateTimeRestrictEnd" region="content" start="AutoUpdateTimeRestrictCheckbox" align=right margin-top=7 margin-right=8 width=97 height=34 spacing=6 } - place { control="ThrottleRateEdit,ThrottleRateApply" region="content" start="ThrottleCheckbox" align=right margin-top=7 margin-right=6 width=97 height=34 spacing=6 } + place { control="ThrottleRateEdit,ThrottleRateApply" region="content" start="ThrottleCheckbox" align=right margin-top=7 margin-right=8 width=97 height=34 spacing=6 } place { control="ThrottleRateEditSuffix" region="content" align=right start="ThrottleRateApply" end-right="ThrottleRateApply" margin-right=10 height=34 } place { control="AllowDownloadsDuringGameplayCheckbox,ThrottleDownloadsWhileStreamingCheckbox,DownloadRatesInBitsCheckbox" region="content" start="ThrottleCheckbox" dir=down width=max height=50 } diff --git a/Adwaita/resource/layout/subpaneloptionsfamily.layout b/Adwaita/resource/layout/subpaneloptionsfamily.layout new file mode 100755 index 00000000..981a0f93 --- /dev/null +++ b/Adwaita/resource/layout/subpaneloptionsfamily.layout @@ -0,0 +1,85 @@ +subpaneloptionsfamily.layout +{ + styles + { + Label + { + padding-top=8 + padding-bottom=8 + render + { + 0="fill(x0, y0-1, x1, y0, window_bg)" + 1="image(x0, y0-12, x0+12, y0, assets/corners/12_mask_window_bg/bl)" + 2="image(x1-12, y0-12, x1, y0, assets/corners/12_mask_window_bg/br)" + } + } + + Highlight + { + padding-top=0 + padding-bottom=0 + render + { + 0="fill(x0, y0-1, x1, y0, window_bg)" + 1="image(x0, y0-12, x0+12, y0, assets/corners/12_mask_window_bg/bl)" + 2="image(x1-12, y0-12, x1, y0, assets/corners/12_mask_window_bg/br)" + 3="image(x0, y1, x0+12, y1+12, assets/corners/12_mask_window_bg/tl)" + 4="image(x1-12, y1, x1, y1+12, assets/corners/12_mask_window_bg/tr)" + } + } + + "TooltipWindow Label" + { + padding-top=0 + padding-bottom=0 + render {} + } + + URLLabel + { + bgcolor="button_bg" + font-size=14 + font-weight=400 + inset-left=12 + padding-top=0 + padding-bottom=0 + render_bg + { + 0="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + render + { + 0="image(x1-28, y0+17, x1-12, y1-17, assets/icons/external_link)" + } + } + URLLabel:hover + { + bgcolor="button_hover_bg" + font-style=regular + } + URLLabel:active + { + bgcolor="button_active_bg" + } + } + + layout + { + region { name="content" margin-top=8 margin-left=16 width=500 height=max } + + place { control="FamilyOptionsTitle" region="content" dir=down width=max height=34 } + place { control="ManageOptionsLabel" region="content" start="FamilyOptionsTitle" dir=down width=max height=50 } + + place { control="FamilySharingTitle" region="content" start="ManageOptionsLabel" dir=down width=max height=34 } + place { control="AuthorizedDeviceCheck,ManageSharingLabel" region="content" start="FamilySharingTitle" dir=down width=max height=50 } + + place { control="Divider1" region="content" start="ManageSharingLabel" dir=down width=max height=16 } + + place { control="ShowNotificationsCheck" region="content" start="Divider1" dir=down width=max height=50 } + place { control="BorrowersLabel" region="content" start="ShowNotificationsCheck" dir=down width=max } + place { control="BorrowersList" region="content" start="BorrowersLabel" dir=down margin-bottom=16 width=max height=max } + + region { name="hidden" width=0 height=0 margin-left=-999 } + place { control="FamilyOptionsText,FamilySharingInfoText" region="hidden" width=0 height=0 } + } +} \ No newline at end of file diff --git a/Adwaita/resource/layout/subpaneloptionsingame.layout b/Adwaita/resource/layout/subpaneloptionsingame.layout index 6f35d6cc..036bc3ef 100755 --- a/Adwaita/resource/layout/subpaneloptionsingame.layout +++ b/Adwaita/resource/layout/subpaneloptionsingame.layout @@ -76,7 +76,7 @@ subpaneloptionsingame.layout Highlight { - inset-top=8 + inset-top=20 render { 0="fill(x0, y0-1, x1, y0, window_bg)" @@ -95,7 +95,7 @@ subpaneloptionsingame.layout { region { name="content" margin-left=16 width=520 height=max overflow=scroll-vertical } - place { control="TitleLabel" region="content" dir=down width=484 height=42 } + place { control="TitleLabel" region="content" dir=down width=484 margin-top=-12 height=54 } place { control="EnableOverlayCheck,EnableVRDesktopGameTheaterCheck,EnableSCTenfootOverlayCheck" region="content" start="TitleLabel" dir=down width=484 height=50 } place { control="ShowIngameFPSCombo,ShowIngameFPSContrastCheck" region="content" start="EnableSCTenfootOverlayCheck" dir=down width=484 height=50 margin-top=16 } @@ -112,7 +112,6 @@ subpaneloptionsingame.layout place { control="Divider2" region="content" start="ShareIPNetworkingURL" dir=down width=484 height=16 } region { name="hidden" width=0 height=0 margin-left=-999 } - place { control="DescriptionLabel,HotKeySelectorLabel,ScreenshotLabel,TextFilterLabel,TextFilterStatus,TextFilterUpdateSettingURL,PingRateLabel,PingRateInfo,PingRateCombo" region="hidden" width=0 height=0 } // hidden because of invalid font issues, no idea what's wrong diff --git a/Adwaita/resource/layout/subpaneloptionsshadercache.layout b/Adwaita/resource/layout/subpaneloptionsshadercache.layout index bc8fbd0b..81c2a980 100755 --- a/Adwaita/resource/layout/subpaneloptionsshadercache.layout +++ b/Adwaita/resource/layout/subpaneloptionsshadercache.layout @@ -23,11 +23,7 @@ subpaneloptionsshadercache.layout layout { region { name="content" margin-top=16 margin-left=16 width=500 height=max } - place { control="ShaderCacheEnabledCheckbox,ShaderCacheBGProcessingEnabledCheckbox" region="content" dir=down width=max height=50 } - place { control="ShaderCacheBGProcessingProgress,ShaderCacheInfo" region="content" start="ShaderCacheBGProcessingEnabledCheckbox" dir=down margin-top=16 width=max spacing=16 } - - region { name="hidden" width=0 height=0 margin-left=-999 } } } diff --git a/Adwaita/resource/menus/steam.menu b/Adwaita/resource/menus/steam.menu index b4299900..7d784cb0 100644 --- a/Adwaita/resource/menus/steam.menu +++ b/Adwaita/resource/menus/steam.menu @@ -4,7 +4,7 @@ menubar { text="" - SkinVersion { text="Adwaita for Steam v0.4" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" } + SkinVersion { text="Adwaita for Steam v0.5" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" } Divider {} diff --git a/Adwaita/resource/styles/steam.styles b/Adwaita/resource/styles/steam.styles index 909b8357..fa4b07ba 100755 --- a/Adwaita/resource/styles/steam.styles +++ b/Adwaita/resource/styles/steam.styles @@ -35,6 +35,76 @@ steam.styles } } + ListPanel + { + inset="0 0 0 0" + padding-left=6 + padding-right=6 + bgcolor="view_bg" + selectedbgcolor="button_bg" + textcolor="button_fg" + selectedtextcolor="button_fg" + shadowtextcolor="button_fg" + font-family=basefont + font-size=14 + font-style=none + render_bg {} + render + { + 0="fill(x0, y0, x1, y0+1, border)" + 1="fill(x0, y1-1, x1, y1, border)" + 2="fill(x0, y0+1, x0+1, y1-1, border)" + 3="fill(x1-1, y0+1, x1, y1-1, border)" + } + } + ListPanelColumnHeader + { + minimum-height=1 + textcolor="button_fg" + font-family=basefont + font-size=14 + font-weight=700 + font-style=none + bgcolor="button_disabled_bg" + render_bg {} + render + { + 0="fill(x0, y1-1, x1, y1, border)" + } + } + ListPanelColumnHeader:hover + { + bgcolor="button_bg" + textcolor="button_fg" + } + ListPanelDragger + { + render + { + 0="fill(x0, y0+1, x0+1, y1-1, border)" + } + } + ListPanelDragger:hover + { + render + { + 0="fill(x0, y0+1, x0+1, y1-1, view_fg)" + } + } + ListPanelInterior + { + inset="-3 0 0 0" + bgcolor=none + render_bg {} + render {} + } + ListPanelCheckBox + { + inset-left=6 + render {} + render_bg {} + } + // splash screen ProgressBox {