Merge pull request #106 from Black4Blade/master

Fixed the skin for the new Chat UI, plus other misc. fixes for the skin.
somini · Aug 1, 2018 · 69a6b67 · 69a6b67
2 parents 30678cb + 00c4c8f
commit 69a6b67
Show file tree

Hide file tree

Showing 17 changed files with 412 additions and 158 deletions.
diff --git a/Graphics/inbox.tga b/Graphics/inbox.tga
diff --git a/Graphics/inbox_active.tga b/Graphics/inbox_active.tga
diff --git a/Graphics/inbox_active_hover.tga b/Graphics/inbox_active_hover.tga
diff --git a/Graphics/inbox_hover.tga b/Graphics/inbox_hover.tga
diff --git a/Graphics/updatenone_notification.tga b/Graphics/updatenone_notification.tga
diff --git a/Graphics/updatenone_notification@2x.tga b/Graphics/updatenone_notification@2x.tga
diff --git a/Graphics/updatenone_notification_hover.tga b/Graphics/updatenone_notification_hover.tga
diff --git a/Graphics/updatenone_notification_hover@2x.tga b/Graphics/updatenone_notification_hover@2x.tga
diff --git a/resource/layout/accountbutton.layout b/resource/layout/accountbutton.layout
@@ -0,0 +1,164 @@
+"resource/layout/accountbutton.layout"
+{
+	controls
+	{
+		account_avatar
+		{
+			"ControlName"	"Image"
+			"fieldName"		"account_avatar"
+			"zpos" 			"-2" // behind dropdown button
+		}
+
+		account_drop_down
+		{
+			"ControlName"	"Label"
+			"fieldName"		"account_drop_down"
+			"zpos" 			"-2" // behind dropdown button
+			"style"			"AccountDropDownStyleOffline"
+		}
+
+
+		account_balance
+		{
+			"ControlName"	"Label"
+			"fieldName"		"account_balance"
+			"style"			"AccountBalanceStyle"
+
+			"zpos" 			"-2" // behind dropdown button
+		}
+
+		account_persona
+		{
+			"ControlName"	"Label"
+			"fieldName"		"account_persona"
+			"style" 		"AccountPersonaStyleOffline"
+			"labelText"		"%persona%"
+			"zpos" 			"-2" // behind dropdown button
+		}
+
+		account_menu_button
+		{
+			"ControlName"	"Button"
+			"fieldName"		"account_menu_button"
+			"labelText"		""
+			"style" 		"AccountMenuButtonStyle"
+		}
+	}
+
+	styles
+	{
+		AccountPersonaStyleOffline
+		{
+			padding-right=6
+			padding-left=12
+			textcolor=Friends.OfflineColor
+		}
+
+		AccountPersonaStyleOnline
+		{
+			padding-right=6
+			padding-left=12
+			textcolor=Friends.OnlineColor
+			render_bg
+		  	{
+				0="gradient_horizontal( x0, y0 - 1, x0 + 2, y1 + 1, Friends.OnlineColor, DialogBG )"
+			}
+		}
+
+		AccountPersonaStyleInGame
+		{
+			padding-right=6
+			padding-left=12
+			textcolor=Friends.InGameColor
+			render_bg
+		  	{
+				0="gradient_horizontal( x0, y0 - 1, x0 + 2, y1 + 1, Friends.InGameColor, DialogBG )"
+			}
+		}
+
+		AccountDropDownStyleOffline
+		{
+			render_bg
+		  	{
+				1="image( x0, y0+10, x1, y1, graphics/dropdown_offline )"
+			}
+
+		}
+
+		AccountDropDownStyleOnline
+		{
+			render_bg
+		  	{
+				1="image( x0, y0 + 10, x1, y1, graphics/dropdown_online )"
+			}
+		}
+
+		AccountDropDownStyleInGame
+		{
+			render_bg
+		  	{
+				1="image( x0, y0+10, x1, y1, graphics/dropdown_ingame )"
+			}
+		}
+
+		AccountButtonStyle
+		{
+			render_bg
+		  	{
+				// background fill
+				0="fill( x0, y0, x1, y1, none )"
+			}
+		}
+
+		AccountButtonStyle:hover
+		{
+			render_bg
+		  	{
+				// background fill
+				0="fill( x0, y0, x1, y1, darkblue )"
+			}
+		}
+
+		AccountBalanceStyle
+		{
+			textcolor="labeldisabled"
+			bgcolor="none"
+			font-family=basefont
+			font-size=14
+			font-weight=400
+			font-style=regular
+			padding-top=1
+			padding-right=8
+			padding-left=2
+		}
+
+		AccountBalanceStyle [$OSX]
+		{
+		      textcolor="labeldisabled"
+		      bgcolor="none"
+		      font-family=basefont
+		      font-size=13
+		      font-weight=400
+		      font-style=regular
+		      inset="0 1 0 0"
+		}
+
+		AccountMenuButtonStyle
+		{
+			render_bg
+		  	{
+				// background fill
+				// 0="fill( x0, y0, x1, y1, darkblue )"
+			}
+		}
+	}
+
+	layout
+	{
+		place { control="account_menu_button" align=left height=34 width=max } // span over everything
+		place { control="account_avatar" align=right height=34 width=34 }
+		place { control="account_persona" align=right end-right="account_drop_down" margin-top=0 height=34}
+		place { control="account_balance" align=right height=24 margin-top=4 end-right="account_persona"}
+		place { control="account_drop_down" align=right end-right="account_avatar" margin-top=5 margin-right=3 height=24 width=8 }
+	}
+}
diff --git a/resource/layout/accountmenu.layout b/resource/layout/accountmenu.layout
@@ -0,0 +1,65 @@
+"resource/layout/accountmenu.layout"
+{
+	controls
+	{
+		view_profile_button { controlname="Button" style="account_menu_button" labelText="#steam_menu_account_view_profile" }
+		view_account_button { controlname="Button" style="account_menu_button" labelText="#steam_menu_account_details" }
+		view_wallet_button	{ controlname="Button" style="account_menu_button" labelText="#steam_menu_account_wallet" }
+		view_preferences_button { controlname="Button" style="account_menu_button" labelText="#steam_menu_account_preferences" }
+		change_user_button	{ controlname="Button" style="account_menu_button" labelText="#steam_menu_account_logout" }
+		account_name_label	{ controlname="Label"  style="account_menu_label" labelText="%account%" }
+		wallet_amount_label { controlname="Label"  style="account_menu_label" labelText="%wallet%" }
+	}
+
+	styles
+	{
+		AccountMenuStyle
+		{
+			render_bg
+			{
+				// top area and graphic
+				0="gradient( x0, y0, x1, y1, MenuBG1, MenuBG2 )"
+
+				1="fill( x0 + 1, y0, x1 - 1, y0 + 1, blueborder )"  // top
+				2="fill( x0 + 1, y1 - 1, x1 - 1, y1, blueborder )"  // bottom
+				3="fill( x0, y0 + 1, x0 + 1, y1 - 1, blueborder )"  // left
+				4="fill( x1 - 1, y0 + 1, x1, y1 - 1, blueborder )"  // right
+			}
+		}
+
+		account_menu_button
+		{
+			font-size=14
+			font-weight=regular
+			textcolor="label"
+			font-style=""
+			render_bg{}
+		}
+
+		account_menu_label
+		{
+			font-size=14
+			font-weight=regular
+			textcolor="Friends.OnlineColor"
+			font-style=""
+			render_bg{}
+		}
+
+		account_menu_button:hover
+		{
+			//textcolor="SuperNavHover"
+			textcolor="TextHover"
+		}
+	}
+
+	layout
+	{
+		place { control="view_profile_button" align=left margin-left=4 margin-top=4  height=24 }
+		place { control="view_account_button" align=left margin-left=4 margin-top=28 height=24 }
+		place { control="change_user_button"  align=left margin-left=4 margin-top=52 height=24 }
+		place { control="account_name_label"  start="change_user_button" dir="right" height=24 margin-left=-4 }
+		place { control="view_preferences_button" align=left margin-left=4 margin-top=76 height=24 }
+		place { control="view_wallet_button,wallet_amount_label" align=left margin-left=4 margin-top=100 height=24  }
+
+	}
+}
diff --git a/resource/layout/downloadsummarypanel.layout b/resource/layout/downloadsummarypanel.layout
@@ -282,7 +282,7 @@
 		place { control="disk_legend_panel" region=legend y=16 x=0  width=9 height=9 }
 		place { control="disk_legend_label" region=legend y=13 x=12 }
 
-        place { control="pauseresumeallbutton" region=head align=right x=490 margin-right=32 margin-top=30 }
+        place { control="pauseresumeallbutton" region=head align=right x=490 margin-right=30 margin-top=30 }
 
         region { name=row1 x=0 y=16 width=max height=22 region=head }
 		region { name=row2 x=0 y=35 width=max height=22 region=head }

diff --git a/resource/layout/overlaytaskbar.layout b/resource/layout/overlaytaskbar.layout
@@ -43,13 +43,6 @@
 			textAlignment=east
 		}
 
-		online_friends
-		{
-			ControlName=Label
-			labelText="#Steam_OnlineFriends"
-			style="online_friends"
-			textAlignment=east
-		}	
 	}
 
 	styles
@@ -74,9 +67,10 @@
 
 		view_friends
 		{
-			textcolor="Text"
-			font-style=regular,uppercase
-			bgcolor="none"
+			inset="0 0 0 0"
+			image="graphics/friends_button"
+			bgcolor=none
+			render_bg {}
 		}
 
 		view_friends:Hover
@@ -100,7 +94,7 @@
 		place { control="SteamLogo" width=1 height=1 x=9999 y=9999 }
 		place { controls="MusicPlayerButton,WebBrowserButton,SettingsButton,ScreenshotsButton" align=right dir=down spacing=7 height=40 width=100 margin-right=18 }	
 		place { control="FriendPanel" region="bottom" height=48 width=48 align=right margin-right=20 margin-top=33 }
-		place { control="view_friends" region="bottom" height=12 align=right margin-right=74 margin-top=43 }
+		place { control="view_friends" region="bottom" height=34 align=right margin-right=74 margin-top=43 }
 		place { control="online_friends" region="bottom" height=12 align=right margin-right=74 margin-top=57 }
 	}	
 }