Update Beta Branch to Current Master + Fixes (#452)

* Revert "Improved Slider control."

This reverts commit 65c3827.

* Fixed text alignment in Friends dialog for new font

* Updated Left-Aligned NavigatorPanel

* Updated to 1.0.6

* Fixes #438

* Update Steam-Client-Beta to master 1.0.6 + Other fixes

- Added Steam Controller Big Picture Overlay option.

* Added option bits/sec view

Display download rates in bits per second.

* Fixed Jumplist Options

* Linux/OSX vs Windows Overlay Options Formatting.

* Formatted options in Advanced Client and Host Submenus in In-Home Streaming

* Revert "Formatted options in Advanced Client and Host Submenus in In-Home Streaming"

This reverts commit e960de5.

* Revert "Revert "Formatted options in Advanced Client and Host Submenus in In-Home Streaming""

This reverts commit a250ff7.

* Added setting for Desktop Game Theater in SteamVR

Note: Untested with OSX and Linux. Please let me know ASAP.

* Bar Adjustment Variation for Linux/OSX and Windows

* Added Cache Clear Buttons, Vac Info

* Family Sharing Settings Changes

* Addendum: Third Party Lanucher Family Sharing Notification

friends/FriendsDialog.res

@@ -93,7 +93,7 @@
 			font-outerglow-color="darkGreyEnd"
 			font-outerglow-offset=1
 			font-outerglow-filtersize=1
-			inset="7 -2 0 0"
+			inset="7 0 0 0"
 			minimum-width=101
 			minimum-height=26
 			render_bg {
@@ -131,7 +131,7 @@
 			textcolor=white
 			font-family=semibold
 			font-style="regular,normal"
-			inset="0 0 0 0"
+			inset="0 2 0 0"
 			render_bg {
 				0="gradient(x0-22, y0+1, x1, y1, grey, lightGreyEnd)"
 				1="fill(x0-22, y0, x1, y0+1, greyHighlight)"

includes/controls.styles

@@ -16,22 +16,10 @@
 			font-weight=400
 			textcolor  = "white"
 			render_bg {
-				0="image_scale(x0+5,y0+10,x1-5,y1-12, graphics/sliders/middle)"
-				// TOP
-				1="image(x0,y0+5,x0+5,y0+10, graphics/sliders/topLeft)"
-				2="image_scale(x0+5,y0+5,x1-5,y0+10, graphics/sliders/topMiddle)"
-				3="image(x1-5,y0+5,x1,y0+10, graphics/sliders/topRight)"
-
-				// LEFT
-				4="image_scale(x0,y0+10,x0+5,y1-12, graphics/sliders/leftMiddle)"
-
-				// RIGHT
-				5="image_scale(x1-5,y0+10,x1,y1-12, graphics/sliders/rightMiddle)"
-
-				// BOTTOM
-				6="image(x0,y1-12,x0+5,y1-8, graphics/sliders/bottomLeft)"
-				7="image_scale(x0+5,y1-12,x1-5,y1-7, graphics/sliders/bottomMiddle)"
-				8="image(x1-5,y1-12,x1,y1-8, graphics/sliders/bottomRight)"
+				0="fill(x0-1, y1-1, x1+1, y1, black65)"
+				1="fill(x0-1, y1-2, x1+1, y1-1, grey50)"
+				2="fill(x0-1, y1-4, x0, y1-1, black65)"
+				3="fill(x1, y1-4, x1+1, y1-1, black65)"
 			}
 		}
 			Slider:focus {

includes/tweaks/uinavigatorpanel.layout

@@ -2233,12 +2233,20 @@ font-size=14 [$LINUX]
  	  		margin-top=81
  	  		margin-right=0
  	  	}
+ 	  	place {
+ 	  		control=phonereminderbar
+ 	  		width=max
+ 	  		height=80
+ 	  		margin-left=0
+ 	  		margin-top=81
+ 	  		margin-right=0
+ 	  	}
 // ********************************************************************************************************
 // "Pages" - These controls place down things like the GameDetails page.
 // ********************************************************************************************************
 		place {
 			control=DownloadsPage
-			start=emailreminderbar
+			start=phonereminderbar
 			width=max
 			height=max
 			margin-left=-1
@@ -2249,7 +2257,7 @@ font-size=14 [$LINUX]
 		}
 		place {
 			control=GamesPage_List
-			start=emailreminderbar
+			start=phonereminderbar
 			width=max
 			height=max
 			margin-left=-1
@@ -2260,7 +2268,7 @@ font-size=14 [$LINUX]
 		}
 		place {
 			control=GamesPage_Details
-			start=emailreminderbar
+			start=phonereminderbar
 			width=max
 			height=max
 			margin-left=-1
@@ -2277,7 +2285,7 @@ font-size=14 [$LINUX]
 			margin-left=-1
 			margin-right=0
 			margin-bottom=0
-			start=emailreminderbar
+			start=phonereminderbar
 			dir=down
 		}
 		place {
@@ -2292,7 +2300,7 @@ font-size=14 [$LINUX]
 		}
 		place {
 			control=BroadcastPage
-			start=emailreminderbar
+			start=phonereminderbar
 			width=max
 			height=max
 			margin-left=0
@@ -2325,7 +2333,7 @@ font-size=14 [$LINUX]
 		}
 		place {
 			control=ConsolePage
-			start=emailreminderbar
+			start=phonereminderbar
 			width=max
 			height=max
 			margin-left=0
@@ -2336,7 +2344,7 @@ font-size=14 [$LINUX]
 		}
 		place {
 			control=MediaPage
-			start=emailreminderbar
+			start=phonereminderbar
 			width=max
 			height=max
 			margin-left=-1
@@ -2347,7 +2355,7 @@ font-size=14 [$LINUX]
 		}
 		place {
 			control=ToolsPage
-			start=emailreminderbar
+			start=phonereminderbar
 			width=max
 			height=max
 			margin-left=-1
@@ -2358,7 +2366,7 @@ font-size=14 [$LINUX]
 		}
 		place {
 			control=MusicPage_Details
-			start=emailreminderbar
+			start=phonereminderbar
 			width=max
 			height=max
 			margin-left=-1

resource/layout/friendpanel.layout

@@ -37,7 +37,7 @@ font-size=15 [$LINUX]
 
 		menuButtonStyle {
 			minimum-width=14
-			padding-top=5
+			padding-top=4
 			padding-bottom=2
 			padding-right=5
 			padding-left=1
@@ -138,21 +138,21 @@ font-size=14 [$LINUX]
 		place [!$OSX] {
 			control="ClanStatusImage,NameLabel,FriendsNameInstanceLabel,MenuButton"
 			x=45
-			y=2
+			y=3
 			spacing=2
 			margin-right=3
 		}
 
 		place {
 			control="StatusLabel"
 			x=45
-			y=16
+			y=17
 		}
 
 		place {
 			control="GameLabel"
 			x=45
-			y=30
+			y=31
 		}
 
 		place {

resource/layout/friendpanel_compact.layout

@@ -37,7 +37,7 @@ font-size=14 [$LINUX]
 		}
 		menuButtonStyle {
 			minimum-width=14
-			padding-top=5
+			padding-top=4
 			padding-bottom=4
 			padding-right=5
 			padding-left=1

resource/layout/gameproperties_general.layout

@@ -57,22 +57,28 @@
 		}
 
 		place {
-			control=EnableOverlayCheck
+			control=EnableOverlayCheck,EnableDesktopGameTheater
 			start=Divider1
 			y=16
 			dir=down
 		}
 
 		place {
 			controls=LaunchOptionsButton,CreateDesktopShortcutButton
-			start=EnableOverlayCheck
+			start=EnableDesktopGameTheater
 			y=16
 			width=340
 			height=28
 			dir=down
 			spacing=16
 		}
 
+		place {
+			controls=FamilySharingUnsupportedLabel
+			margin-top=462
+			margin-left=20
+		}
+
 		place {
 			controls=ExternalSignupLabel,ExternalSignupButton
 			width=0

resource/layout/pagedragframe.layout

@@ -0,0 +1,40 @@
+"resource/layout/pagedragframe.layout" {
+	styles {
+		PageDragFrame {			
+			bgcolor=darkestGrey
+
+			render_bg {
+				0="fill(x0,y0,x1,y1, darkestGrey)"
+
+				1="gradient(x0+1,y0+2,x1-1,y1,grey,lightGreyEnd)"
+
+				// Single pixel corner fills
+				2="fill(x0+1,y0+1,x0+2,y0+2, darkGreyEnd)" // Top Left
+				3="fill(x0+1,y1-1,x0+2,y1, darkGreyEnd)" // Bottom Left
+				4="fill(x1-2,y0+1,x1-1,y0+2, darkGreyEnd)" // Top Right
+				5="fill(x1-2,y1-1,x1-1,y1, darkGreyEnd)" // Bottom Right
+
+				// Anti-aliased grey highlight
+				6="fill(x0+1,y0+2,x0+2,y0+3, lighterGrey)" // Top Bottom Left
+				7="fill(x0+2,y0+1,x0+3,y0+2, lighterGrey)" // Top Top Left
+				8="fill(x1-3, y0+1, x1-2, y0+2, lighterGrey)" // Top Top Right
+				9="fill(x1-2,y0+2,x1-1,y0+3, lighterGrey)" // Top Bottom Right
+
+				// Grey Highlight
+				10="fill(x0+3,y0+1,x1-3,y0+2, greyHighlight)"
+			}
+		}
+
+		PageDragPanel {
+			bgcolor=darkestGrey
+		}
+	}
+
+	layout {
+	  place {
+	  	control="DragPropertySheet"
+	  	width=max
+	  	height=max
+	  }
+	}
+}

resource/layout/settingssubstreaming_advanced_client.layout

@@ -8,14 +8,14 @@
 		}
 
 		place {
-			control="DescriptionLabel,BandwidthLabel,BandwidthLimit,ResolutionLabel,ResolutionLimit,EnableHardwareDecoding,EnableDebugOverlay"
+			control="DescriptionLabel,BandwidthLabel,BandwidthLimit,ResolutionLabel,ResolutionLimit,AudioChannelsLabel,AudioChannelSelect,EnableHardwareDecoding,EnableDebugOverlay"
 			align=top
 			width=max
 			margin-left=32
-			margin-top=42
+			margin-top=37
 			margin-right=32
 			dir=down
-			spacing=12
+			spacing=10
 		}
 
 		place {

resource/layout/settingssubstreaming_advanced_host.layout

@@ -8,16 +8,75 @@ layout {
 		}
 
 		place {
-			control="DescriptionLabel,EnableHardwareEncoding,EnableDWMCapture,EnableTrafficPriorityLabel,EnableTrafficPriority"
+			control="DescriptionLabel,DynamicallyAdjustResolution,EnableHardwareEncoding"
 			align=top
 			width=max
 			margin-left=32
-			margin-top=42
+			margin-top=33
+			margin-right=27
+			dir=down
+			spacing=-2
+		}
+
+		place {
+			control="EnableHardwareEncodingNVIDIA"
+			start=EnableHardwareEncoding
+			align=top
+			width=max
+			margin-left=20
+			margin-top=-2
 			margin-right=32
 			dir=down
-			spacing=12
+			spacing=-2
 		}
-
+
+		place {
+			control="EnableHardwareEncodingNVFBCH264"
+			start=EnableHardwareEncodingNVIDIA
+			align=top
+			width=max
+			margin-left=20
+			margin-top=-2
+			margin-right=37
+			dir=down
+			spacing=-2
+		}
+
+		place {
+			control="EnableHardwareEncodingAMD,EnableHardwareEncodingIntel"
+			start=EnableHardwareEncodingNVFBCH264
+			align=top
+			width=max
+			margin-left=-20
+			margin-top=-2
+			margin-right=32
+			dir=down
+			spacing=-2
+		}
+		place {
+			control="SoftwareEncodingThreadsLabel,SoftwareEncodingThreads"
+			start=EnableHardwareEncodingIntel
+			align=top
+			width=max
+			margin-left=-20
+			margin-top=-2
+			margin-right=27
+			spacing=3
+			dir=down
+		}
+
+		place {
+			control="EnableTrafficPriorityLabel,EnableTrafficPriority"
+			start=SoftwareEncodingThreads
+			align=top
+			width=max
+			margin-left=0
+			margin-top=2
+			margin-right=27
+			spacing=0
+			dir=down
+		}
+
 		place {
 			control="SupportInformationLabel"
 			region="bottom"

resource/layout/subpaneloptionsbrowser.layout

@@ -52,5 +52,14 @@
 			margin-top=15
 			dir=down
 		}
+		place {
+			controls=ClearWebCacheButton
+			region=bottom
+			start=ClearAllCookiesButton
+			width=240
+			height=28
+			margin-top=15
+			dir=down
+		}
 	}
 }