From 9b16e959b5325b59f1ff130b3bcc4c160743c915 Mon Sep 17 00:00:00 2001 From: ungstein <73730003+ungstein@users.noreply.github.com> Date: Sun, 27 Jun 2021 01:20:28 +0930 Subject: [PATCH] v1.0.7 Minor tweaks - Fixed Friend Game Invite Dialog - Fixed scrollbar once and for all --- OG-Steam/friends/friendgameinvitedialog.res | 130 +++++++++++ OG-Steam/resource/layout/downloadspage.layout | 4 +- .../layout/downloadsummarypanel.layout | 2 +- .../resource/layout/settingsdialog.layout | 4 + OG-Steam/resource/styles/steam.styles | 211 ++++++++++++++---- Patch Notes.txt | 8 + 6 files changed, 309 insertions(+), 50 deletions(-) create mode 100644 OG-Steam/friends/friendgameinvitedialog.res diff --git a/OG-Steam/friends/friendgameinvitedialog.res b/OG-Steam/friends/friendgameinvitedialog.res new file mode 100644 index 0000000..272ae28 --- /dev/null +++ b/OG-Steam/friends/friendgameinvitedialog.res @@ -0,0 +1,130 @@ +"Friends/friendgameinvitedialog.res" +{ + controls + { + "FriendGameInviteDialog" + { + "ControlName" "CFriendGameInviteDialog" + "fieldName" "FriendGameInviteDialog" + "xpos" "2123" + "ypos" "549" + "wide" "356" + "tall" "746" + "AutoResize" "1" + "PinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "paintbackground" "1" + "settitlebarvisible" "1" + style="FriendsPanel" + closeonescape=1 + } + + "BuddyList" + { + "ControlName" "CFriendsListSubPanel" + "fieldName" "BuddyList" + "AutoResize" "3" + "PinCorner" "0" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "paintbackground" "0" + "linespacing" "48" + style="FriendsList" + } + + "CloseButton" + { + "ControlName" "Button" + "fieldName" "CloseButton" + "xpos" "10" + "ypos" "707" + "wide" "150" + "tall" "24" + "AutoResize" "0" + "PinCorner" "2" + "visible" "1" + "enabled" "1" + "tabPosition" "0" + "paintbackground" "1" + "labelText" "#Friends_InviteToGame_Close" + "textAlignment" "west" + "wrap" "0" + "Default" "0" + "selected" "0" + } + } + + + styles + { + + FriendsList + { + bgcolor="DarkGreenBG" + render_bg + { + 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 + } + } + + FriendsPanel + { + 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 + } + } + + RootMenu + { + bgcolor="none" + } + + + FriendsTitle + { + inset="0 0 0 0" + } + + FriendsTitle [$OSX] + { + font-family=basefont + font-size=15 + font-weight=400 + textcolor="textdisabled" + bgcolor="none" + inset="0 9 0 0" + } + + FriendsTitle:FrameFocus [$OSX] + { + font-family=basefont + font-size=15 + font-weight=400 + textcolor="texthover" + bgcolor="none" + inset="0 9 0 0" + } + } + + layout + { + // the title bar is missing, so increase the size of the grip + place { control="frame_captiongrip" margin=2 width=max height=38 } + + place { control="buddylist" align=left margin-left=10 margin-right=7 margin-top=36 margin-bottom=48 width=max height=max } + } + +} + + diff --git a/OG-Steam/resource/layout/downloadspage.layout b/OG-Steam/resource/layout/downloadspage.layout index dad436c..652cb33 100644 --- a/OG-Steam/resource/layout/downloadspage.layout +++ b/OG-Steam/resource/layout/downloadspage.layout @@ -37,7 +37,7 @@ layout { // place { control="panel_list" width=max height=max margin=1 } - region { name=main x=0 y=0 margin=5 } - place { control="downloadsummarypanel,panel_list" dir=down region=main width=max height=max spacing=0 margin=-5} + region { name=main x=0 y=0 margin-right=-2 } + place { control="downloadsummarypanel,panel_list" dir=down region=main width=max height=max spacing=0 margin=0} } } diff --git a/OG-Steam/resource/layout/downloadsummarypanel.layout b/OG-Steam/resource/layout/downloadsummarypanel.layout index 3cb69ab..f8bb925 100644 --- a/OG-Steam/resource/layout/downloadsummarypanel.layout +++ b/OG-Steam/resource/layout/downloadsummarypanel.layout @@ -131,7 +131,7 @@ CDownloadSummaryPanel { bgcolor=panelBackground - inset="0 0 0 0" + inset="0 0 0 0" } throttleLabel diff --git a/OG-Steam/resource/layout/settingsdialog.layout b/OG-Steam/resource/layout/settingsdialog.layout index f957247..0a56fd3 100644 --- a/OG-Steam/resource/layout/settingsdialog.layout +++ b/OG-Steam/resource/layout/settingsdialog.layout @@ -14,6 +14,7 @@ { CDialogSettings { + font-family=basefont font-size=16 minimum-width="800" minimum-height="620" @@ -26,6 +27,7 @@ PropertySheet { + font-family=basefont font-size=16 minimum-width="535" minimum-height="505" @@ -45,6 +47,7 @@ inset="-2 0 0 0" minimum-width="190" minimum-height="525" + font-family=basefont font-size=18 padding=6 render @@ -55,6 +58,7 @@ ListPanelInterior { inset="3 0 0 0" + font-family=basefont font-size=16 textcolor="White" bgcolor="none" diff --git a/OG-Steam/resource/styles/steam.styles b/OG-Steam/resource/styles/steam.styles index a2ab29a..eb2acf2 100644 --- a/OG-Steam/resource/styles/steam.styles +++ b/OG-Steam/resource/styles/steam.styles @@ -1097,8 +1097,9 @@ steam.styles } } - FrameTitle:FrameFocus { - font-family = basefont + FrameTitle:FrameFocus + { + font-family=basefont font-size=16 padding-left="0" padding-right="64" @@ -1112,7 +1113,7 @@ steam.styles "CFriendsDialog SectionedListPanelInterior" { - bgcolor=none + bgcolor="none" font-family=basefont font-size=16 font-weight=400 @@ -1122,13 +1123,9 @@ steam.styles shadowtextcolor="TextDisabled" // the color of disabled line items render { - //gradient to obscure content at top of scrolling region - } render_bg { - // background gradient - } } @@ -1653,7 +1650,7 @@ steam.styles "Csteamrootdialog ListPanelInterior:scrollbar" { - inset="3 0 -1 0" + inset="0 0 0 0" bgcolor=none render { @@ -1680,7 +1677,7 @@ steam.styles "Page ListPanelInterior:scrollbar" { - inset="3 1 -1 0" + inset="0 0 0 0" font-size=16 bgcolor=none render @@ -1991,6 +1988,9 @@ steam.styles font-weight=400 textcolor="Text" bgcolor="none" + render_bg + { + } } ProgressBar @@ -2025,7 +2025,7 @@ steam.styles "CFriendsDialog PropertySheet" { - bgcolor="none" + bgcolor="DarkGreenBG" } RadioButton @@ -2143,7 +2143,7 @@ steam.styles Scrollbar { bgcolor=none - inset = "0 1 4 3" + inset = "0 0 3 1" } Scrollbar.Horizontal @@ -2152,8 +2152,9 @@ steam.styles inset = "0 1 1 3" } - Scrollbarbutton + ScrollBarButton.up { + inset="-1 2 0 0" bgcolor=GreenBG render_bg { @@ -2170,8 +2171,47 @@ steam.styles } } + ScrollBarButton.up:hover + { + inset="-1 2 0 0" + 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 + + //Up Arrow + 10="fill( x0 + 8, y0 + 6, x0 + 9, y0 + 7, White )" + 11="fill( x0 + 7, y0 + 7, x0 + 10, y0 + 8, White )" + 12="fill( x0 + 6, y0 + 8, x0 + 11, y0 + 9, White )" + 13="fill( x0 + 5, y0 + 9, x0 + 12, y0 + 10, White )" + } + } + + Scrollbarbutton.up:active + { + inset="-1 2 0 0" + bgcolor=GreenBG + render_bg + { + 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 + + //Up Arrow + 10="fill( x0 + 8, y0 + 6, x0 + 9, y0 + 7, White )" + 11="fill( x0 + 7, y0 + 7, x0 + 10, y0 + 8, White )" + 12="fill( x0 + 6, y0 + 8, x0 + 11, y0 + 9, White )" + 13="fill( x0 + 5, y0 + 9, x0 + 12, y0 + 10, White )" + } + } + Scrollbarbutton.down { + inset="-2 0 0 0" bgcolor=GreenBG render_bg { @@ -2187,6 +2227,45 @@ steam.styles 13="fill( x0 + 5, y0 + 7, x0 + 12, y0 + 8, BorderBright )" } } + + Scrollbarbutton.down:hover + { + + inset="-2 0 0 0" + 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 + + //Down Arrow + 10="fill( x0 + 8, y0 + 10, x0 + 9, y0 + 11, White )" + 11="fill( x0 + 7, y0 + 9, x0 + 10, y0 + 10, White )" + 12="fill( x0 + 6, y0 + 8, x0 + 11, y0 + 9, White )" + 13="fill( x0 + 5, y0 + 7, x0 + 12, y0 + 8, White )" + } + } + + Scrollbarbutton.down:active + { + inset="-2 0 0 0" + bgcolor=GreenBG + render_bg + { + 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 + + //Down Arrow + 10="fill( x0 + 8, y0 + 10, x0 + 9, y0 + 11, White )" + 11="fill( x0 + 7, y0 + 9, x0 + 10, y0 + 10, White )" + 12="fill( x0 + 6, y0 + 8, x0 + 11, y0 + 9, White )" + 13="fill( x0 + 5, y0 + 7, x0 + 12, y0 + 8, White )" + } + } Scrollbarbutton.left { @@ -2205,6 +2284,42 @@ steam.styles 13="fill( x0 + 6, y0 + 7, x0 + 7, y0 + 8, BorderBright )" } } + + Scrollbarbutton.left:hover + { + 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 + + //Left Arrow + 10="fill( x0 + 9, y0 + 4, x0 + 10, y0 + 11, White )" + 11="fill( x0 + 8, y0 + 5, x0 + 9, y0 + 10, White )" + 12="fill( x0 + 7, y0 + 6, x0 + 8, y0 + 9, White )" + 13="fill( x0 + 6, y0 + 7, x0 + 7, y0 + 8, White )" + } + } + + Scrollbarbutton.left:active + { + bgcolor=GreenBG + render_bg + { + 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 + + //Left Arrow + 10="fill( x0 + 9, y0 + 4, x0 + 10, y0 + 11, White )" + 11="fill( x0 + 8, y0 + 5, x0 + 9, y0 + 10, White )" + 12="fill( x0 + 7, y0 + 6, x0 + 8, y0 + 9, White )" + 13="fill( x0 + 6, y0 + 7, x0 + 7, y0 + 8, White )" + } + } Scrollbarbutton.right { @@ -2224,6 +2339,42 @@ steam.styles } } + Scrollbarbutton.right:hover + { + 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 + + //Right Arrow + 10="fill( x0 + 6, y0 + 4, x0 + 7, y0 + 11, White )" + 11="fill( x0 + 7, y0 + 5, x0 + 8, y0 + 10, White )" + 12="fill( x0 + 8, y0 + 6, x0 + 9, y0 + 9, White )" + 13="fill( x0 + 9, y0 + 7, x0 + 10, y0 + 8, White )" + } + } + + Scrollbarbutton.right:active + { + bgcolor=GreenBG + render_bg + { + 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 + + //Right Arrow + 10="fill( x0 + 6, y0 + 4, x0 + 7, y0 + 11, White )" + 11="fill( x0 + 7, y0 + 5, x0 + 8, y0 + 10, White )" + 12="fill( x0 + 8, y0 + 6, x0 + 9, y0 + 9, White )" + 13="fill( x0 + 9, y0 + 7, x0 + 10, y0 + 8, White )" + } + } + ScrollBarHandle { bgcolor=GreenBG @@ -2277,7 +2428,6 @@ steam.styles ScrollBarSlider // gutter { bgcolor="LightGreenBG" - inset="0 0 0 0" render_bg { 5="fill( x0 + 1, y0 + 1, x1 - 1, y1 - 1, LightGreenBG )" // inside @@ -2350,7 +2500,7 @@ steam.styles SectionedListPanel { - bgcolor="propertysheetbg" + bgcolor="none" inset="0 0 0 0" font-family=basefont font-size=16 @@ -2361,28 +2511,6 @@ steam.styles bgcolor="none" render_bg { - // lines around - 1="fill( x0 + 2, y0, x1 - 2, y0 + 1, ButtonBorderDisabled )" // top - 2="fill( x0 + 2, y1 - 1, x1 - 2, y1, ButtonBorderDisabled )" // bottom - 3="fill( x0, y0 + 2, x0 + 1, y1 - 2, ButtonBorderDisabled )" // left - 4="fill( x1 - 1, y0 + 2, x1, y1 - 2, ButtonBorderDisabled )" // right - - // single pixel fills in the corners - 5="fill( x0 + 1, y0 + 1, x0 + 2, y0 + 2, ButtonBorderDisabled )" - 6="fill( x1 - 2, y0 + 1, x1 - 1, y0 + 2, ButtonBorderDisabled )" - 7="fill( x0 + 1, y1 - 2, x0 + 2, y1 - 1, ButtonBorderDisabled )" - 8="fill( x1 - 2, y1 - 2, x1 - 1, y1 - 1, ButtonBorderDisabled )" - 11="fill( x0, y0 + 1, x0 + 1, y0 + 2, ButtonBorderDisabled2 )" - 12="fill( x1 - 1, y0 + 1, x1, y0 + 2, ButtonBorderDisabled2 )" - 13="fill( x0, y1 - 2, x0 + 1, y1 - 1, ButtonBorderDisabled2 )" - 14="fill( x1 - 1, y1 - 2, x1, y1 - 1, ButtonBorderDisabled2 )" - 15="fill( x0 + 1, y0, x0 + 2, y0 + 1, ButtonBorderDisabled2 )" - 16="fill( x1 - 2, y0, x1 - 1, y0 + 1, ButtonBorderDisabled2 )" - 17="fill( x0 + 1, y1 - 1, x0 + 2, y1, ButtonBorderDisabled2 )" - 18="fill( x1 - 2, y1 - 1, x1 - 1, y1, ButtonBorderDisabled2 )" - - // background gradient - 0="gradient( x0 + 1, y0 + 1, x1, y0 + 1, Propertysheetbg, BackgroundStartOpaque)" } } @@ -2397,17 +2525,6 @@ steam.styles selectedbgcolor="MaizeBG" render_bg { - // background fill - 0="gradient( x0 + 1, y0, x1 - 1, y0 + 140, dialogbg, almostblack )" - 1="fill( x0 + 1, y0 + 140, x1 - 1, y1-1, almostblack )" - - //lines around, special due to tabs at top - 2="gradient( x1 - 1, y0 -1, x1, y1 -1, dialogbg, ButtonBorderDisabled )" // right - 3="gradient( x0, y0, x0 + 1, y1 - 2, dialogbg, ButtonBorderDisabled )" // left - - //single pixel fills - 4="fill( x0, y1-1, x0 + 1, y1, dialogbg )" - 5="fill( x1-1, y1-1, x1, y1, dialogbg )" } } diff --git a/Patch Notes.txt b/Patch Notes.txt index 38ef0f6..789cb1a 100644 --- a/Patch Notes.txt +++ b/Patch Notes.txt @@ -4,6 +4,14 @@ OG-Steam Patch Notes ------------------------------------------------------------ +v1.0.7 + +Minor tweaks +- Fixed Friend Game Invite Dialog +- Fixed scrollbar once and for all + +------------------------------------------------------------ + v1.0.6 Minor tweaks