From 977bce35225cecf52396e628a6c085aade2b6e8a Mon Sep 17 00:00:00 2001 From: tkashkin Date: Tue, 15 Nov 2022 13:05:07 +0300 Subject: [PATCH] InstallSubComplete (Fixes #72) --- Adwaita/adw/controls/window.styles | 8 +- .../resource/layout/overlaywebbrowser.layout | 2 +- Adwaita/resource/menus/steam.menu | 2 +- Adwaita/resource/styles/gameoverlay.styles | 7 + Adwaita/steam/cached/InstallSubComplete.res | 133 ++++++++++++++++++ .../InstallSubComplete_RetailInstall.res | 133 ++++++++++++++++++ 6 files changed, 276 insertions(+), 9 deletions(-) create mode 100755 Adwaita/steam/cached/InstallSubComplete.res create mode 100755 Adwaita/steam/cached/InstallSubComplete_RetailInstall.res diff --git a/Adwaita/adw/controls/window.styles b/Adwaita/adw/controls/window.styles index 5a1e30c0..56cb2dae 100644 --- a/Adwaita/adw/controls/window.styles +++ b/Adwaita/adw/controls/window.styles @@ -13,13 +13,7 @@ window.styles { bgcolor="window_bg" render_bg {} - render - { - 0="fill(x0, y0, x1, y0+1, window_border)" - 1="fill(x0, y1-1, x1, y1, window_border)" - 2="fill(x0, y0+1, x0+1, y1-1, window_border)" - 3="fill(x1-1, y0+1, x1, y1-1, window_border)" - } + render {} } FrameTitle diff --git a/Adwaita/resource/layout/overlaywebbrowser.layout b/Adwaita/resource/layout/overlaywebbrowser.layout index 53835002..f10ed2af 100755 --- a/Adwaita/resource/layout/overlaywebbrowser.layout +++ b/Adwaita/resource/layout/overlaywebbrowser.layout @@ -4,7 +4,7 @@ overlaywebbrowser.layout { HTML { - inset="2 0 2 2" + inset="0 0 0 0" } BackButtonSm diff --git a/Adwaita/resource/menus/steam.menu b/Adwaita/resource/menus/steam.menu index d3a421e5..669a3f7e 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.18" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" } + SkinVersion { text="Adwaita for Steam v0.19" shellcmd="steam://openurl/https://github.com/tkashkin/Adwaita-for-Steam" } Divider {} diff --git a/Adwaita/resource/styles/gameoverlay.styles b/Adwaita/resource/styles/gameoverlay.styles index c09fbbb7..7877a329 100755 --- a/Adwaita/resource/styles/gameoverlay.styles +++ b/Adwaita/resource/styles/gameoverlay.styles @@ -7,6 +7,13 @@ gameoverlay.styles Frame { minimum-width=534 + render + { + 0="fill(x0, y0, x1, y0+1, window_border)" + 1="fill(x0, y1-1, x1, y1, window_border)" + 2="fill(x0, y0+1, x0+1, y1-1, window_border)" + 3="fill(x1-1, y0+1, x1, y1-1, window_border)" + } } FrameTitle diff --git a/Adwaita/steam/cached/InstallSubComplete.res b/Adwaita/steam/cached/InstallSubComplete.res new file mode 100755 index 00000000..6ba19e5d --- /dev/null +++ b/Adwaita/steam/cached/InstallSubComplete.res @@ -0,0 +1,133 @@ +InstallSubComplete.res +{ + styles + { + CInstallSubComplete + { + render + { + 0="image(x0+16, y0+150, x0+28, y0+162, assets/corners/12_mask_window_bg/tl)" + 1="image(x1-28, y0+150, x1-16, y0+162, assets/corners/12_mask_window_bg/tr)" + } + } + + CheckButton + { + inset="5 6 6 6" + padding-right=64 + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked)" + } + render_bg + { + 0="fill(x0, y0, x1, y1, button_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + CheckButton:hover + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked_hover)" + } + render_bg + { + 0="fill(x0, y0, x1, y1, button_hover_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + CheckButton:active + { + image="assets/pixel" + render_bg + { + 0="fill(x0, y0, x1, y1, button_active_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + CheckButton:selected + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked)" + } + } + CheckButton:selected:hover + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked_hover)" + } + } + CheckButton:disabled + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked_disabled)" + } + render_bg + { + 0="fill(x0, y0, x1, y1, button_disabled_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + CheckButton:disabled:selected + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked_disabled)" + } + render_bg + { + 0="fill(x0, y0, x1, y1, button_disabled_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + + 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/forward)" + 1="image(x0, y1-12, x1+12, y1, assets/corners/12_mask_window_bg/bl)" + 2="image(x1-12, y1-12, x1, y1, assets/corners/12_mask_window_bg/br)" + } + } + URLLabel:hover + { + bgcolor="button_hover_bg" + font-style=regular + } + URLLabel:active + { + bgcolor="button_active_bg" + } + } + + layout + { + place { control="InstallCompleteLabel" dir=down margin-top=16 margin-left=16 margin-right=16 width=max } + + place { control="AutoLaunchCheck,DontShowAgainCheck,DownloadsPageLink" dir=down margin-top=150 margin-left=16 margin-right=16 width=max height=50 } + + region { name="hidden" width=0 height=0 margin-left=-999 } + place { control="InstallLanguageLabel,LanguageCombo" region="hidden" width=0 height=0 } + } +} diff --git a/Adwaita/steam/cached/InstallSubComplete_RetailInstall.res b/Adwaita/steam/cached/InstallSubComplete_RetailInstall.res new file mode 100755 index 00000000..7afb57f4 --- /dev/null +++ b/Adwaita/steam/cached/InstallSubComplete_RetailInstall.res @@ -0,0 +1,133 @@ +InstallSubComplete_RetailInstall.res +{ + styles + { + CInstallSubComplete + { + render + { + 0="image(x0+16, y0+150, x0+28, y0+162, assets/corners/12_mask_window_bg/tl)" + 1="image(x1-28, y0+150, x1-16, y0+162, assets/corners/12_mask_window_bg/tr)" + } + } + + CheckButton + { + inset="5 6 6 6" + padding-right=64 + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked)" + } + render_bg + { + 0="fill(x0, y0, x1, y1, button_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + CheckButton:hover + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked_hover)" + } + render_bg + { + 0="fill(x0, y0, x1, y1, button_hover_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + CheckButton:active + { + image="assets/pixel" + render_bg + { + 0="fill(x0, y0, x1, y1, button_active_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + CheckButton:selected + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked)" + } + } + CheckButton:selected:hover + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked_hover)" + } + } + CheckButton:disabled + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/unchecked_disabled)" + } + render_bg + { + 0="fill(x0, y0, x1, y1, button_disabled_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + CheckButton:disabled:selected + { + image="assets/pixel" + render + { + 0="image(x1-60, y0+12, x1-12, y1-12, assets/switch/checked_disabled)" + } + render_bg + { + 0="fill(x0, y0, x1, y1, button_disabled_bg)" + 1="fill(x0, y1-1, x1, y1, headerbar_shade)" + } + } + + 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/forward)" + 1="image(x0, y1-12, x1+12, y1, assets/corners/12_mask_window_bg/bl)" + 2="image(x1-12, y1-12, x1, y1, assets/corners/12_mask_window_bg/br)" + } + } + URLLabel:hover + { + bgcolor="button_hover_bg" + font-style=regular + } + URLLabel:active + { + bgcolor="button_active_bg" + } + } + + layout + { + place { control="InstallConfirm,Label1" dir=down margin-top=16 margin-left=16 margin-right=16 width=max spacing=8 } + + place { control="AutoLaunchCheck,DontShowAgainCheck,DownloadsPageLink" dir=down margin-top=150 margin-left=16 margin-right=16 width=max height=50 } + + region { name="hidden" width=0 height=0 margin-left=-999 } + place { control="InstallLanguageLabel,LanguageCombo" region="hidden" width=0 height=0 } + } +}