From 5bd72e86862ce39399c8449a6c5f50b275157465 Mon Sep 17 00:00:00 2001 From: ungstein <73730003+ungstein@users.noreply.github.com> Date: Sun, 27 Jun 2021 01:16:30 +0930 Subject: [PATCH] v1.0.5 Minor tweaks - Improved overlay web browser layout --- .../resource/layout/overlaywebbrowser.layout | 1 - OG-Steam/resource/layout/toolwindow.layout | 114 +++++++++++++++++- OG-Steam/servers/DialogServerBrowser.res | 1 - Patch Notes.txt | 7 ++ README.md | 16 +-- 5 files changed, 127 insertions(+), 12 deletions(-) diff --git a/OG-Steam/resource/layout/overlaywebbrowser.layout b/OG-Steam/resource/layout/overlaywebbrowser.layout index fd714c0..47f883e 100644 --- a/OG-Steam/resource/layout/overlaywebbrowser.layout +++ b/OG-Steam/resource/layout/overlaywebbrowser.layout @@ -152,7 +152,6 @@ layout { - place [!$OSX] { control="frame_minimize,frame_maximize,frame_close" align=right margin-top=8 margin-right=8 spacing=2 } place { control="HTMLField" width=max height=max margin-top=65 margin-left=4 margin-right=4 margin-bottom=26 } place { control="StatusText" align=bottom height=24 margin-left=9 margin-bottom=1 } place { control="PageLoadThrobber" align=right margin-top=34 margin-right=10 width=20 height=20 } diff --git a/OG-Steam/resource/layout/toolwindow.layout b/OG-Steam/resource/layout/toolwindow.layout index 05f63ab..0d5054c 100644 --- a/OG-Steam/resource/layout/toolwindow.layout +++ b/OG-Steam/resource/layout/toolwindow.layout @@ -17,12 +17,122 @@ 2="fill( x0, y1 - 1, x1, y1, BorderDark )" // bottom 3="fill( x0, y0, x0 + 1, y1 - 1, BorderBright )" // left 4="fill( x1 - 1, y0, x1, y1, BorderDark )" // right - } + } } + + ToolWindow:framefocus + { + bgcolor = GreenBG + render_bg { + 1="fill( x0, y0, x1, y0 + 1, BorderBright )" // top + 2="fill( x0, y1 - 1, x1, y1, BorderDark )" // bottom + 3="fill( x0, y0, x0 + 1, y1 - 1, BorderBright )" // left + 4="fill( x1 - 1, y0, x1, y1, BorderDark )" // right + } + } + + + Button + { + textcolor="0 0 0 0" // don't render the + as text + render_bg + { + // background fill + 1="fill( x0, y0, x1, y0 + 1, BorderBright )" // top + 2="fill( x0, y1 - 1, x1, y1, BorderDark )" // bottom + 3="fill( x0, y0, x0 + 1, y1 - 1, BorderBright )" // left + 4="fill( x1 - 1, y0, x1, y1, BorderDark )" // right + + 5="fill( x0, y0, x1 - 1, y1 - 1, none )" + 6="image(x0 + 6, y0 + 7, x1, y1 - 1, graphics/new_tab)" + } + } + + Button:hover + { + render_bg + { + // background fill + 1="fill( x0, y0, x1, y0 + 1, BorderBright )" // top + 2="fill( x0, y1 - 1, x1, y1, BorderDark )" // bottom + 3="fill( x0, y0, x0 + 1, y1 - 1, BorderBright )" // left + 4="fill( x1 - 1, y0, x1, y1, BorderDark )" // right + + 5="fill( x0, y0, x1 - 1, y1 - 1, none )" + 6="image(x0 + 6, y0 + 7, x1, y1 - 1, graphics/new_tab)" + } + } + + Button:active + { + render_bg + { + // background fill + 1="fill( x0, y0, x1, y0 + 1, BorderDark )" // top + 2="fill( x0, y1 - 1, x1, y1, BorderBright )" // bottom + 3="fill( x0, y0, x0 + 1, y1 - 1, BorderDark )" // left + 4="fill( x1 - 1, y0, x1, y1, BorderBright )" // right + + 5="fill( x0, y0, x1 - 1, y1 - 1, none )" + 6="image(x0 + 6, y0 + 7, x1, y1 - 1, graphics/new_tab)" + } + } + + MenuButton + { + padding-right=4 + bgcolor=none + render_bg + { + // background fill + 0="fill( x0, y0, x1 - 1, y1 - 1, GreenBG )" + } + } + + TabMenuButtonFlash + { + bgcolor=none + render_bg + { + // background fill + 0="fill( x0, y0, x1 - 1, y1 - 1, Maize )" + } + } + + TabMenuItemFlash + { + textcolor="PropertySheet.FlashTabColor" + } + + PageTab + { + font-size=14 + font-style=regular + } + + PageTab:hover + { + font-size=14 + font-style=regular + } + + PageTab:selected:hover + { + font-size=14 + font-style=regular + } + + PageTab:selected + { + font-size=14 + font-style=regular + } + } layout { - place { control="ToolWindowSheet" x=8 y=23 height=max width=max margin-right=8 } + place [!$OSX] { control="ToolWindowSheet" x=10 y=24 height=max width=max margin-right=10 margin-bottom=-10 } + place [$OSX] { control="ToolWindowSheet" x=10 y=24 height=max width=max margin-right=10 margin-bottom=-10 } } } diff --git a/OG-Steam/servers/DialogServerBrowser.res b/OG-Steam/servers/DialogServerBrowser.res index 60d8eb8..3bf8899 100644 --- a/OG-Steam/servers/DialogServerBrowser.res +++ b/OG-Steam/servers/DialogServerBrowser.res @@ -58,7 +58,6 @@ layout { - place [!$OSX] { control="frame_minimize,frame_maximize,frame_close" align=right margin-top=8 margin-right=8 spacing=2 } place { control="GameTabs" width=max height=max margin-top=36 margin-bottom=32 margin-left=12 margin-right=12 } } } diff --git a/Patch Notes.txt b/Patch Notes.txt index 6d1786c..e2cc664 100644 --- a/Patch Notes.txt +++ b/Patch Notes.txt @@ -4,6 +4,13 @@ OG-Steam Patch Notes ------------------------------------------------------------ +v1.0.5 + +Minor tweaks +- Improved overlay web browser layout + +------------------------------------------------------------ + v1.0.4 Minor tweaks diff --git a/README.md b/README.md index 749cd6c..5f44acc 100644 --- a/README.md +++ b/README.md @@ -21,11 +21,11 @@ Installing Preview - -![Login](https://nfbtkq.bn.files.1drv.com/y4p4xgPS5IctfXxbvny8VJcOQa1ejmlZVcu48-zWNF1a_zFNFm5e1vx1sojmu-pC-OtJCitua8aZ21hTZL6zVnK3lpiDHnwmmN2bk5Cl9w_9z1q34n4kuRa_sevNHnfZVmX4bePLFD36E69fRXuRS27XqzE223B17nKkT4rf3lxnnAi3W2d2BZyqZAeUXZDWWKlJYLrQfno5WGrPPJiTGb29ZRfvupiB2vDo27fsxmHXE4?encodeFailures=1) -![Store](https://nfbtkq.bn.files.1drv.com/y4pbk62U99Xr863140xpj-vRcRFk5BWEiJnWNSbIGmx5vYwQgzIrA2Tg1MRPWni_WkA8oAJIIVwHhV4WERn8O59Ug6humK9aQQvSgTQNBRq4MlXjlfVSigmpl-jEu5p6QOZjoTSr3faNQZjRc6sId8dPbcVcLUiwlsr_nQxC2k17zYbQL7E0RYsxUYEQX44kfp4QDfLTPQ2_2HNrPAmmLbStjurLysviLkmz-JYvywlSCw?encodeFailures=1) -![Library](https://nfbtkq.bn.files.1drv.com/y4p07-ggxU_iTISRe7MsU-uPZbyRHhwMdz4xG1e_ogcaw4ySfj-IFT6hAnIL_WQUlTQTgNk1F1hqOJkOISWSnJ9XkOHhfM16h2Om6VP25yvN8PNIYVBLkEF6s3YfexKdOnHpsyiGGG87nSfCxAqoQG2DHhIL4bI5Vyy1s7msqTy3hojV3SOuqchZmX-3tiJEIeFK7WKbCseXpitSo-XqJamMG8J0t8yGz7pjCRp5V5Xcps?encodeFailures=1) -![Downloads](https://o5fhpa.bn.files.1drv.com/y4pEjULESoU4NCVLCIAt8mOHH5SxlHLE-nvuxlsE9I_UwdhS13DTpTL5WvF9-xcJiNFFtzHTqQEzWzyqRmI_0FxsRmqkfTo02tqNEW-43OyhrljcO0H0cQPTX0GTbC1ClYmHLflwW-ttBc-2WMBf7N61ntYY6YeUndVWMzeKnC8rPtMqVH015O5Y52scSsJ-p3Sa53Qw-_2or-i8_Y_Xc-wonjdmClQ_grB8hJZKKR2OK0?encodeFailures=1) -![Small Mode](https://nfbtkq.bn.files.1drv.com/y4pByDMLafetGOmN0rVqE1xx-Uc-UxDw6QtKnKUi2Fv7VZfuZRvqEqaN1q1X6bo_DXIpVa5Jq3oW_n1EVIBZtigqNXD101n-qk7cNw1fv0oBk9G3z_XmPNlEipSc814MLRUz34Vlwm-YqTLZpoW4eQDefPpULnwwjnJR3r-YIRnfB56lhl-8zd5To-ilxa82Q52wjrrpNvNSnJ0OxoUysZr-e-Ghh6oAwTNxxUo1FsDCog?encodeFailures=1) -![Overlay](https://nfbtkq.bn.files.1drv.com/y4p7jmBJIm-1N5VMV-fzE9sf_JtewvUxm08xZoyxd-8EzRcQyyRkLUlPYsb3MXXS6-MHQ5CesKz2sWksW_gJQG4LXWDQ_erlS4BS2Jz9Jr3USXzANk0gqHsZfRD6feXlyh4G-5kz4tWYgOcIpZ4G5p3xgZLd17thn26P8E2CJSLuC9OsHS2YyYvkOeba5yM8kwYCFzz5Pn8bV0zcJ1vgXGq61gJtmM2Y41sWggMdgJHNN0?encodeFailures=1) -![Servers](https://nfbtkq.bn.files.1drv.com/y4p47QV4YhJllcPzVUODuprzXHdmzFz6oQJfT0G9Tu_72saYVEkEk7ws6EBeeLLD_Qulolw9mMVzNLvvBihiFdkQXxYRo6uRtNCUVxC9LSBDi_MKU5faaNwab8eQtiBALhgwlkq2m29gsJ8TUpb0pZaLQzcLBI-RB1seYA1W7dZYaDkwLco47qR-kORqVRq6O5TtRO1bYs69FFKoGO-3sAMrlsmpY-OB_VUFbRIR5MZRc8?encodeFailures=1) -![Music Player](https://nfbtkq.bn.files.1drv.com/y4paRdkH-9SqqoztAC6TrSmOct-xysQaalO9Cqf8zTFs2iTa4LQZ97vbR_Ho8jbnkrDSxWwQd8sqOQtiWboWPwipRjxn-tgfb5Mx178e7YUz5hUoFB_79lp-Bae1NblCerCyw1_MbHdkiwrPm1i1p-kWu4FlMkD3aHWDxxhGRgUGBwLvIoDfjmsw0-jnwemiXv2cMGQGCwyMO2c9YUsW5W0u2fdldZzcI05ngx4zoAeK2w?encodeFailures=1) +![Login](https://i.imgur.com/WKZDfDh.png) +![Store](https://i.imgur.com/mp2UUsD.png) +![Library](https://i.imgur.com/FDgb8Io.png) +![Downloads](https://i.imgur.com/xKJfu7F.png) +![Small Mode](https://i.imgur.com/xGfhAYk.png) +![Overlay](https://i.imgur.com/qAKf6k6.png) +![Servers](https://i.imgur.com/gbjGIbd.png) +![Music Player](https://i.imgur.com/kQcwd0S.png)