From 5a0b3c5c4b0025f87a28380f176ea87acc30d1c3 Mon Sep 17 00:00:00 2001 From: JackMyth Date: Fri, 16 Oct 2020 19:31:29 +0800 Subject: [PATCH] Update Settings layout --- resource/layout/subpaneloptionsingame.layout | 61 ++++++++++++-------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/resource/layout/subpaneloptionsingame.layout b/resource/layout/subpaneloptionsingame.layout index 0bb3244..3bc51d4 100644 --- a/resource/layout/subpaneloptionsingame.layout +++ b/resource/layout/subpaneloptionsingame.layout @@ -4,7 +4,7 @@ { TitleLabel { controlname=label labeltext="#Steam_SettingsInGameTitle" style=highlight } EnableOverlayCheck { ControlName=CheckButton labelText="#Overlay_SettingsEnable" } - EnableSCTenfootOverlayCheck [!$OSX&&!$LINUX] { ControlName=CheckButton labelText="#Overlay_SettingsSCTenfootEnable" } + EnableSCTenfootOverlayCheck [!$OSX] { ControlName=CheckButton labelText="#Overlay_SettingsSCTenfootEnable" } EnableVRDesktopGameTheaterCheck [!$OSX&&!$LINUX] { ControlName=CheckButton labelText="#Overlay_SettingsEnableVRDesktopGameTheaterCheck" } HotKeySelector { ControlName=HotKeyEntry } ScreenshotHotKeySelector { ControlName=HotKeyEntry } @@ -29,7 +29,11 @@ { controlname=combobox editable="0" - } + } + + TextFilterLabel { controlname=label labeltext="#Steam_TextFilterSettingLabel" wrap=1 style=highlight } + TextFilterStatus { controlname=label wrap=1 } + TextFilterUpdateSettingURL { controlname=urllabel labeltext="#Steam_TextFilterSettingURL" URLText="steam://url/TextFilterSettings" wrap=1 style=highlight } } colors @@ -40,9 +44,7 @@ { highlight { - textcolor=DefaultText - font-size=18 [$LINUX] - font-size=24 + textcolor=Text } checkbox @@ -54,36 +56,45 @@ layout { - region { name=box margin-top=20 margin-bottom=20 margin-left=20 margin-right=20 width=max height=max } + region { name=box margin-top=10 margin-bottom=20 margin-left=20 margin-right=20 width=max height=max } + region { name=top region=box margin-top=10 } + region { name=topleft region=top y=140 width=255 margin-right=20 } + region { name=topright region=top x=263 width=235 y=131} - place { controls=TitleLabel region=box } - place { controls=DescriptionLabel width=max region=box start=TitleLabel width=max dir=down margin-top=8 } - place { controls=EnableOverlayCheck region=box start=DescriptionLabel margin-top=5 width=max dir=down } - place [!$OSX&&!$LINUX] { controls=EnableSCTenfootOverlayCheck region=box start=EnableOverlayCheck dir=down } - place [!$OSX&&!$LINUX] { controls=EnableVRDesktopGameTheaterCheck region=box start=EnableSCTenfootOverlayCheck dir=down } + region { name=bottom region=box y=320 } + region { name=bottomleft region=bottom width=255 margin-right=20 } + region { name=bottomright region=bottom x=263 width=255 } - place [$WINDOWS] { controls=HotKeySelectorLabel,HotKeySelector start=EnableVRDesktopGameTheaterCheck margin-top=10 dir=down spacing=5 width=220 region=box } - place [!$WINDOWS] { controls=HotKeySelectorLabel,HotKeySelector start=EnableOverlayCheck margin-top=10 dir=down spacing=5 width=220 region=box } + place { controls=TitleLabel region=top } + place { controls=DescriptionLabel height=40 width=max region=top start=TitleLabel dir=down margin-top=8 } + place { controls=EnableOverlayCheck region=top start=DescriptionLabel dir=down height=20 } + place [!$OSX] { controls=EnableSCTenfootOverlayCheck region=top start=EnableOverlayCheck dir=down height=20 } + place [!$OSX&&!$LINUX] { controls=EnableVRDesktopGameTheaterCheck region=top start=EnableSCTenfootOverlayCheck dir=down height=20 } + place { controls=HotKeySelectorLabel,HotKeySelector dir=down spacing=5 width=max region=topleft } - place { controls=ShowIngameFPSLabel,ShowIngameFPSCombo,ShowIngameFPSContrastCheck dir=down spacing=5 start=HotKeySelector margin-top=55 width=220 region=box } + place { controls=ShowIngameFPSLabel,ShowIngameFPSCombo,ShowIngameFPSContrastCheck dir=down spacing=5 start=HotKeySelector margin-top=44 width=max region=topleft } - place [$WINDOWS] { controls=ScreenshotLabel start=EnableVRDesktopGameTheaterCheck margin-top=10 x=270 dir=down region=box } - place [!$WINDOWS] { controls=ScreenshotLabel start=EnableOverlayCheck margin-top=10 x=270 dir=down region=box } + place { controls=ScreenshotLabel region=topright } place { controls=ScreenshotHotKeySelector,SetScreenshotFolderButton dir=down start=ScreenshotLabel margin-top=4 spacing=5 - width=220 - region=box } - - place { control=ScreenshotActionLabel region=box start=SetScreenshotFolderButton dir=down margin-top=20 } + width=max + height=22 + region=topright } + place { control=ScreenshotActionLabel region=topright start=SetScreenshotFolderButton dir=down margin-top=19 } place { controls=ScreenshotNotifyCheck,ScreenshotPlaySoundCheck,ScreenshotSaveUncompressedCheck dir=down start=ScreenshotActionLabel - margin-top=6 margin-left=10 region=box } + margin-top=6 margin-left=10 height=22 width=max region=topright } - place { control=Divider1 start=ShowIngameFPSContrastCheck dir=down margin-top=40 region=box width=max } - place { controls="PingRateLabel" region=box start=Divider1 margin-top=10 width=max dir=down } - place { controls="PingRateCombo" region=box start=PingRateLabel margin-top=10 width=235 dir=down height=25 } - place { controls="PingRateInfo" region=box start=PingRateCombo margin-top=10 width=max dir=down } + place { control=Divider1 region=bottom width=max } + + place { controls="PingRateLabel" region=bottomright start=Divider1 margin-top=10 width=max dir=down } + place { controls="PingRateCombo" region=bottomright start=PingRateLabel margin-top=10 width=235 dir=down height=25 } + place { controls="PingRateInfo" region=bottomright start=PingRateCombo margin-top=10 width=235 dir=down } + + place { controls="TextFilterLabel" region=bottomleft start=Divider1 margin-top=10 width=max dir=down } + place { controls="TextFilterStatus" region=bottomleft start=TextFilterLabel margin-top=10 width=235 dir=down height=25 } + place { controls="TextFilterUpdateSettingURL" region=bottomleft start=TextFilterStatus margin-top=10 width=235 dir=down } } }