Make size and white-space of "Asset Browser" panel consistent

2021-09-24 15:43:31 +03:00
parent 8fb3bbe5f9
commit a69d86c587
2 changed files with 53 additions and 63 deletions
--- a/mods/cnc/chrome/assetbrowser.yaml
+++ b/mods/cnc/chrome/assetbrowser.yaml
@@ -2,8 +2,8 @@ Container@ASSETBROWSER_PANEL:
 	Logic: AssetBrowserLogic
 	X: (WINDOW_RIGHT - WIDTH) / 2
 	Y: (WINDOW_BOTTOM - HEIGHT) / 2
-	Width: 695
-	Height: 435
+	Width: 900
+	Height: 540
 	Children:
 		LogicTicker@ANIMATION_TICKER:
 		Label@ASSETBROWSER_TITLE:
@@ -15,36 +15,35 @@ Container@ASSETBROWSER_PANEL:
 			Text: Asset Browser
 		Background@bg:
 			Width: PARENT_RIGHT
-			Height: 435
+			Height: PARENT_BOTTOM
 			Background: panel-black
 			Children:
 				Label@SOURCE_SELECTOR_DESC:
 					X: 15
 					Y: 6
-					Width: 160
+					Width: 195
 					Height: 25
 					Font: TinyBold
 					Align: Center
 					Text: Select asset source
 				DropDownButton@SOURCE_SELECTOR:
 					X: 15
-					Y: 35
-					Width: 160
+					Y: 30
+					Width: 195
 					Height: 25
 					Font: Bold
 					Text: Folders
 				ScrollPanel@ASSET_LIST:
 					X: 15
 					Y: 65
-					Width: 160
-					Height: 275
+					Width: 195
+					Height: PARENT_BOTTOM - 170
 					CollapseHiddenChildren: True
 					Children:
 						ScrollItem@ASSET_TEMPLATE:
 							Width: PARENT_RIGHT - 27
 							Height: 25
 							X: 2
-							Y: 0
 							Visible: false
 							EnableChildMouseOver: True
 							Children:
@@ -56,16 +55,16 @@ Container@ASSETBROWSER_PANEL:
 									TooltipTemplate: SIMPLE_TOOLTIP
 				Label@FILENAME_DESC:
 					X: 15
-					Y: 341
-					Width: 160
+					Y: PARENT_BOTTOM - HEIGHT - 74
+					Width: 195
 					Height: 25
 					Font: TinyBold
 					Align: Center
 					Text: Filter by name
 				TextField@FILENAME_INPUT:
 					X: 15
-					Y: 365
-					Width: 160
+					Y: PARENT_BOTTOM - HEIGHT - 50
+					Width: 195
 					Height: 25
 					Type: Filename
 				Label@PALETTE_DESC:
@@ -94,10 +93,10 @@ Container@ASSETBROWSER_PANEL:
 							Width: PARENT_RIGHT - 35
 							Height: PARENT_BOTTOM - 12
 				Background@SPRITE_BG:
-					X: 190
+					X: 225
 					Y: 65
-					Width: 490
-					Height: 325
+					Width: PARENT_RIGHT - 195 - 45
+					Height: PARENT_BOTTOM - 115
 					Background: scrollpanel-bg
 					Children:
 						Sprite@SPRITE:
@@ -108,15 +107,15 @@ Container@ASSETBROWSER_PANEL:
 							Height: PARENT_BOTTOM
 							AspectRatio: 1
 						Label@ERROR:
-							X: 5
-							Width: 490 - 10
-							Height: 325
+							Width: PARENT_RIGHT
+							Height: PARENT_BOTTOM
 							Align: Center
 							Visible: false
 							Text: Error displaying file. See assetbrowser.log for details.
 				Container@FRAME_SELECTOR:
-					X: 190
-					Y: 395
+					X: 225
+					Y: PARENT_BOTTOM - 40
+					Width: PARENT_RIGHT - 225
 					Children:
 						Button@BUTTON_PREV:
 							Width: 26
@@ -186,19 +185,19 @@ Container@ASSETBROWSER_PANEL:
 						Slider@FRAME_SLIDER:
 							X: 140
 							Y: 3
-							Width: 300
+							Width: PARENT_RIGHT - 140 - 85
 							Height: 20
 							MinimumValue: 0
 						Label@FRAME_COUNT:
-							X: 445
+							X: PARENT_RIGHT - WIDTH + 5
 							Y: 1
-							Width: 40
+							Width: 80
 							Height: 25
 							Font: TinyBold
 							Align: Left
 		Button@CLOSE_BUTTON:
 			Key: escape
-			Y: 434
+			Y: PARENT_BOTTOM - 1
 			Width: 140
 			Height: 35
 			Text: Back
--- a/mods/common/chrome/assetbrowser.yaml
+++ b/mods/common/chrome/assetbrowser.yaml
@@ -2,12 +2,12 @@ Background@ASSETBROWSER_PANEL:
 	Logic: AssetBrowserLogic
 	X: (WINDOW_RIGHT - WIDTH) / 2
 	Y: (WINDOW_BOTTOM - HEIGHT) / 2
-	Width: 700
-	Height: 500
+	Width: 900
+	Height: 600
 	Children:
 		LogicTicker@ANIMATION_TICKER:
 		Label@ASSETBROWSER_TITLE:
-			Y: 21
+			Y: 16
 			Width: PARENT_RIGHT
 			Height: 25
 			Font: Bold
@@ -16,7 +16,7 @@ Background@ASSETBROWSER_PANEL:
 		Label@SOURCE_SELECTOR_DESC:
 			X: 20
 			Y: 36
-			Width: 160
+			Width: 195
 			Height: 25
 			Font: TinyBold
 			Align: Center
@@ -24,22 +24,21 @@ Background@ASSETBROWSER_PANEL:
 		DropDownButton@SOURCE_SELECTOR:
 			X: 20
 			Y: 60
-			Width: 160
+			Width: 195
 			Height: 25
 			Font: Bold
 			Text: Folders
 		ScrollPanel@ASSET_LIST:
 			X: 20
 			Y: 90
-			Width: 160
-			Height: 275
+			Width: 195
+			Height: PARENT_BOTTOM - 225
 			CollapseHiddenChildren: True
 			Children:
 				ScrollItem@ASSET_TEMPLATE:
 					Width: PARENT_RIGHT - 27
 					Height: 25
 					X: 2
-					Y: 0
 					Visible: false
 					EnableChildMouseOver: True
 					Children:
@@ -51,16 +50,16 @@ Background@ASSETBROWSER_PANEL:
 							TooltipTemplate: SIMPLE_TOOLTIP
 		Label@FILENAME_DESC:
 			X: 20
-			Y: 371
-			Width: 160
+			Y: 471
+			Width: 195
 			Height: 25
 			Font: TinyBold
 			Align: Center
 			Text: Filter by name
 		TextField@FILENAME_INPUT:
 			X: 20
-			Y: 395
-			Width: 160
+			Y: PARENT_BOTTOM - 105
+			Width: 195
 			Height: 25
 			Type: Filename
 		Label@PALETTE_DESC:
@@ -89,10 +88,10 @@ Background@ASSETBROWSER_PANEL:
 					Width: PARENT_RIGHT - 35
 					Height: PARENT_BOTTOM - 12
 		Background@SPRITE_BG:
-			X: 190
+			X: 226
 			Y: 90
-			Width: 490
-			Height: 330
+			Width: PARENT_RIGHT - 226 - 20
+			Height: PARENT_BOTTOM - 170
 			Background: dialog3
 			Children:
 				Sprite@SPRITE:
@@ -108,20 +107,17 @@ Background@ASSETBROWSER_PANEL:
 					Palette: colorpicker
 					PlayerPalette: colorpicker
 				Label@ERROR:
-					Y: 1
-					X: 5
-					Width: 490 - 10
-					Height: 330
+					Width: PARENT_RIGHT
+					Height: PARENT_BOTTOM
 					Align: Center
 					Visible: false
 					Text: Error displaying file. See assetbrowser.log for details.
 		Container@FRAME_SELECTOR:
-			X: 190
-			Y: 425
+			X: 226
+			Y: PARENT_BOTTOM - 75
+			Width: PARENT_RIGHT - 226
 			Children:
 				Button@BUTTON_PREV:
-					X: 0
-					Y: 0
 					Width: 26
 					Height: 26
 					Key: LEFT
@@ -133,7 +129,6 @@ Background@ASSETBROWSER_PANEL:
 							ImageName: prev
 				Button@BUTTON_PLAY:
 					X: 35
-					Y: 0
 					Width: 26
 					Height: 26
 					Key: SPACE
@@ -146,7 +141,6 @@ Background@ASSETBROWSER_PANEL:
 				Button@BUTTON_PAUSE:
 					Visible: false
 					X: 35
-					Y: 0
 					Width: 26
 					Height: 26
 					Key: SPACE
@@ -158,7 +152,6 @@ Background@ASSETBROWSER_PANEL:
 							ImageName: pause
 				Button@BUTTON_STOP:
 					X: 70
-					Y: 0
 					Width: 26
 					Height: 26
 					Key: RETURN
@@ -170,7 +163,6 @@ Background@ASSETBROWSER_PANEL:
 							ImageName: stop
 				Button@BUTTON_NEXT:
 					X: 105
-					Y: 0
 					Width: 26
 					Height: 26
 					Key: RIGHT
@@ -183,22 +175,21 @@ Background@ASSETBROWSER_PANEL:
 				Slider@FRAME_SLIDER:
 					X: 140
 					Y: 3
-					Width: 300
+					Width: PARENT_RIGHT - 140 - 85
 					Height: 20
 					MinimumValue: 0
 				Label@FRAME_COUNT:
-					X: 445
+					X: PARENT_RIGHT - WIDTH + 5
 					Y: 1
-					Width: 40
+					Width: 85
 					Height: 25
 					Font: TinyBold
 					Align: Left
 		Container@VOXEL_SELECTOR:
-			X: 60
-			Y: 425
+			X: 226
+			Y: PARENT_BOTTOM - 75
 			Children:
 				Label@ROLL:
-					X: 140
 					Y: 1
 					Width: 40
 					Height: 25
@@ -206,14 +197,14 @@ Background@ASSETBROWSER_PANEL:
 					Align: Left
 					Text: Roll
 				Slider@ROLL_SLIDER:
-					X: 165
+					X: 30
 					Y: 3
 					Width: 100
 					Height: 20
 					MinimumValue: 1
 					MaximumValue: 1023
 				Label@PITCH:
-					X: 310
+					X: 150
 					Y: 1
 					Width: 40
 					Height: 25
@@ -221,14 +212,14 @@ Background@ASSETBROWSER_PANEL:
 					Align: Left
 					Text: Pitch
 				Slider@PITCH_SLIDER:
-					X: 335
+					X: 190
 					Y: 3
 					Width: 100
 					Height: 20
 					MinimumValue: 1
 					MaximumValue: 1023
 				Label@YAW:
-					X: 480
+					X: 305
 					Y: 1
 					Width: 40
 					Height: 25
@@ -236,7 +227,7 @@ Background@ASSETBROWSER_PANEL:
 					Align: Left
 					Text: Yaw
 				Slider@YAW_SLIDER:
-					X: 505
+					X: 335
 					Y: 3
 					Width: 100
 					Height: 20