#368 show colors in color drop down

[devo1929]

Decreased width of color drop down allows for increase of width of player name and side. Color drop down is now the same width as team and start drop downs.

Moved the "Random" label to an INI key.

[github-actions]

Nightly build for this pull request:

• artifacts.zip
  This comment is automatic and is meant to allow guests to get latest automatic builds without registering. It is updated on every successful build.

[SadPencil]

Suggested change

	private static readonly string RandomColorDefaultLabel = "Random".L10N("UI:Main:RandomSide");
	private static readonly string RandomColorDefaultLabel = "Random".L10N("UI:Main:RandomColor");

And also considering making this a readonly property to prevent L10N being called before loading the translation table (although it should works without being a property as long as the class is initialized after L10N initialized but it is not straightforward enough).

[devo1929]

I'm not sure I understand. It is currently readonly. Are you saying it shouldn't be readonly?

[devo1929]

Good catch on the incorrect string.

[SadPencil]

I'm not sure I understand. It is currently readonly. Are you saying it shouldn't be readonly?

No. I mean changing = to =>

[devo1929]

Ahhhhh, I got it. Will do.

[devo1929]

Done.

[SadPencil]

LGTM

[Rampastring]

Seeing the gap between the dropdown border and the color, it might be best if either a custom dropdown control was added that got rid of the gap, or I made the gap customizable in XNAUI.

[pzhlkj6612]

The design of this PR has side-effect on COOP maps. I'm now testing the YR client btw.

Symptom

We cannot see which colors are disallowed.

Test

• Make a map. Maps\Custom\yuri.map for example.
• Modify INI\MPMaps.ini and add these lines:

[MultiMaps]
; ...
test=Maps\Custom\yuri

[Maps\Custom\yuri]
IsCoopMission=yes
GameModes=Battle
DisallowedPlayerSides=5,6,7,8 ; World Socialist Alliance
DisallowedPlayerColors=0,2,4,6 ; Yellow, Blue, Orange, Purple

.

[pzhlkj6612]

Suggested change

	if(mpColor.Name.StartsWith("$"))
	ddPlayerColor.AddItem(string.Empty, AssetLoader.CreateTexture(mpColor.XnaColor, ddPlayerColor.Width - 2, ddPlayerColor.ItemHeight + 2));
	if (mpColor.Name.StartsWith("$"))
	ddPlayerColor.AddItem(string.Empty, AssetLoader.CreateTexture(mpColor.XnaColor, ddPlayerColor.Width - 2, ddPlayerColor.ItemHeight));

Otherwise, some items will be partially outside the box.

A screenshot. The width of the color has been decreased to show which color is being highlighted. This is the client (bae3855) with built-in resources:

Seeing the gap between the dropdown border and the color, ...

Yes, the additional 2 pixels look like a workaround for the gap, but we didn't fully succeed.

[pzhlkj6612]

Suggested change

	private static string RandomColorDefaultLabel => "Random".L10N("UI:Main:RandomColor");
	private static string RandomColorDefaultLabel => "Random".L10N("Client:Main:RandomColor");

Before we merge the code into the current "develop" branch.

[pzhlkj6612]

If we don't have to decrease the width of color drop down, I think we can try the design like I said in #368 (comment) to eliminate the side-effect on COOP maps with disallowed colors. Screenshot:

Code:

                 foreach (MultiplayerColor mpColor in MPColors)
                 {
                     if(mpColor.Name.StartsWith("$"))
-                        ddPlayerColor.AddItem(string.Empty, AssetLoader.CreateTexture(mpColor.XnaColor, ddPlayerColor.Width - 2, ddPlayerColor.ItemHeight + 2));
+                        ddPlayerColor.AddItem(new XNADropDownItem()
+                        {
+                            Text = mpColor.Name.TrimStart('$'),
+                            Texture = AssetLoader.CreateTexture(mpColor.XnaColor, ddPlayerColor.ItemHeight - 2, ddPlayerColor.ItemHeight - 2),
+                        });
                     else
                         ddPlayerColor.AddItem(mpColor.Name, mpColor.XnaColor);
                 }

And of course, we can decrease the width of color drop down by reducing the width of color blocks. For example:

Texture = AssetLoader.CreateTexture(..., (ddPlayerColor.ItemHeight - 2) / 3, ...),

.