Merge ColorPreviewManagerWidget into ColorPickerManager.

2021-04-11 21:55:23 +01:00
parent 7b58f03f1c
commit f65de2dd43
25 changed files with 59 additions and 103 deletions
--- a/mods/cnc/chrome/assetbrowser.yaml
+++ b/mods/cnc/chrome/assetbrowser.yaml
@@ -6,7 +6,6 @@ Container@ASSETBROWSER_PANEL:
 	Height: 435
 	Children:
 		LogicTicker@ANIMATION_TICKER:
-		ColorPreviewManager@COLOR_MANAGER:
 		Label@ASSETBROWSER_TITLE:
 			Width: PARENT_RIGHT
 			Y: 0 - 22
--- a/mods/cnc/chrome/lobby.yaml
+++ b/mods/cnc/chrome/lobby.yaml
@@ -5,7 +5,6 @@ Container@SERVER_LOBBY:
 	Width: 900
 	Height: 575
 	Children:
-		ColorPreviewManager@COLOR_MANAGER:
 		Label@SERVER_NAME:
 			Width: PARENT_RIGHT
 			Y: 0 - 22
--- a/mods/cnc/chrome/mainmenu-prompts.yaml
+++ b/mods/cnc/chrome/mainmenu-prompts.yaml
@@ -58,7 +58,6 @@ Container@MAINMENU_INTRODUCTION_PROMPT:
 					Height: 25
 					Text: Preferred Color:
 					Align: Right
-				ColorPreviewManager@COLOR_MANAGER:
 				DropDownButton@PLAYERCOLOR:
 					X: 415 + 60
 					Y: 90
--- a/mods/cnc/chrome/settings-display.yaml
+++ b/mods/cnc/chrome/settings-display.yaml
@@ -30,7 +30,6 @@ Container@DISPLAY_PANEL:
 			Height: 25
 			Text: Preferred Color:
 			Align: Right
-		ColorPreviewManager@COLOR_MANAGER:
 		DropDownButton@PLAYERCOLOR:
 			X: 415
 			Y: 40
--- a/mods/cnc/metrics.yaml
+++ b/mods/cnc/metrics.yaml
@@ -5,5 +5,4 @@ Metrics:
 	ButtonFont: Bold
 	CheckboxPressedState: true
 	ColorPickerActorType: fact.colorpicker
-	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 	TextfieldColorHighlight: 800000
--- a/mods/cnc/rules/world.yaml
+++ b/mods/cnc/rules/world.yaml
@@ -255,6 +255,7 @@ World:
 	ScriptTriggers:
 	TimeLimitManager:
 	ColorPickerManager:
+		RemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 		TeamColorPresets: f70606, ff7a22, f8d3b3, f8e947, 94b319, f335a0, a64d6c, ce08f9, f5b2db, 12b572, 502048, 1d06f7, 328dff, 78dbf8, cef6b1, 391d1d

 EditorWorld:
--- a/mods/common/chrome/assetbrowser.yaml
+++ b/mods/common/chrome/assetbrowser.yaml
@@ -6,7 +6,6 @@ Background@ASSETBROWSER_PANEL:
 	Height: 500
 	Children:
 		LogicTicker@ANIMATION_TICKER:
-		ColorPreviewManager@COLOR_MANAGER:
 		Label@ASSETBROWSER_TITLE:
 			Y: 21
 			Width: PARENT_RIGHT
--- a/mods/common/chrome/lobby.yaml
+++ b/mods/common/chrome/lobby.yaml
@@ -5,7 +5,6 @@ Background@SERVER_LOBBY:
 	Width: 900
 	Height: 600
 	Children:
-		ColorPreviewManager@COLOR_MANAGER:
 		Label@SERVER_NAME:
 			Y: 16
 			Align: Center
--- a/mods/common/chrome/mainmenu-prompts.yaml
+++ b/mods/common/chrome/mainmenu-prompts.yaml
@@ -53,7 +53,6 @@ Background@MAINMENU_INTRODUCTION_PROMPT:
 			Height: 25
 			Text: Preferred Color:
 			Align: Right
-		ColorPreviewManager@COLOR_MANAGER:
 		DropDownButton@PLAYERCOLOR:
 			X: 415 + 60
 			Y: 130
--- a/mods/common/chrome/settings-display.yaml
+++ b/mods/common/chrome/settings-display.yaml
@@ -24,7 +24,6 @@ Container@DISPLAY_PANEL:
 			Height: 25
 			Text: Preferred Color:
 			Align: Right
-		ColorPreviewManager@COLOR_MANAGER:
 		DropDownButton@PLAYERCOLOR:
 			X: 415
 			Y: 40
--- a/mods/d2k/metrics.yaml
+++ b/mods/d2k/metrics.yaml
@@ -1,7 +1,6 @@
 # General dumping-ground for UI element sizes, etc.
 Metrics:
 	ColorPickerActorType: carryall.colorpicker
-	ColorPickerRemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
 	FactionSuffix-fremen: atreides
 	FactionSuffix-corrino: harkonnen
 	FactionSuffix-smuggler: ordos
--- a/mods/d2k/rules/world.yaml
+++ b/mods/d2k/rules/world.yaml
@@ -236,6 +236,7 @@ World:
 	StartGameNotification:
 	TimeLimitManager:
 	ColorPickerManager:
+		RemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
 		TeamColorPresets: 9023cd, f53333, ffae00, fff830, 87f506, f872ad, da06f3, ddb8ff, def7b2, 39c46f, 200738, 280df6, 2f86f2, 76d2f8, 498221, 392929

 EditorWorld:
--- a/mods/modcontent/metrics.yaml
+++ b/mods/modcontent/metrics.yaml
@@ -4,7 +4,6 @@ Metrics:
 	ButtonDepth: 0
 	ButtonFont: Bold
 	CheckboxPressedState: true
-	ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
 	ChatLineSound: ChatLine
 	ClickDisabledSound: ClickDisabledSound
 	ClickSound: ClickSound
--- a/mods/ra/metrics.yaml
+++ b/mods/ra/metrics.yaml
@@ -2,7 +2,6 @@

 Metrics:
 	ColorPickerActorType: fact.colorpicker
-	ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
 	FactionSuffix-allies: allies
 	FactionSuffix-england: allies
 	FactionSuffix-france: allies
--- a/mods/ra/rules/world.yaml
+++ b/mods/ra/rules/world.yaml
@@ -281,6 +281,7 @@ World:
 			2: WarningTwoMinutesRemaining
 			1: WarningOneMinuteRemaining
 	ColorPickerManager:
+		RemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
 		TeamColorPresets: f7b3b3, f50606, 98331f, f57606, f7bb06, f861a4, da06f3, ddb8ff, 06f739, cef7b2, 200738, 280df6, 2f86f2, 76d2f8, 34ba93, 391d1d

 EditorWorld:
--- a/mods/ts/metrics.yaml
+++ b/mods/ts/metrics.yaml
@@ -1,5 +1,4 @@
 # General dumping-ground for UI element sizes, etc.
 Metrics:
 	ColorPickerActorType: mmch.colorpicker
-	ColorPickerRemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
 	TextfieldColorHighlight: 1a1a1a
--- a/mods/ts/rules/world.yaml
+++ b/mods/ts/rules/world.yaml
@@ -381,6 +381,7 @@ World:
 	ScriptTriggers:
 	TimeLimitManager:
 	ColorPickerManager:
+		RemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
 		TeamColorPresets: f70606, ff7a22, f8d3b3, f8e947, 94b319, f335a0, a64d6c, ce08f9, f5b2db, 12b572, 4A1948, 1d06f7, 328dff, 78dbf8, cef6b1, 391d1d

 EditorWorld: