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/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