Ticket #4350: 4350_dropdown_label.2.patch

binaries/data/mods/mod/gui/common/modern/sprites.xml

@@ -199 +199 @@
             size = "0 1 100% 100%-1"
         />
     </sprite>
+    <sprite name="ModernDarkBoxGoldDisabled">
+        <effect grayscale=""/>
+        <!-- borders -->
+        <image texture = "global/modern/gold-separator.png"
+            real_texture_placement = "0 0 806 1"
+            size = "0 0 100% 1"
+        />
+        <image texture = "global/modern/gold-separator.png"
+            real_texture_placement = "0 0 806 1"
+            size = "0 100%-1 100% 100%"
+        />
+        <!-- background -->
+        <image backcolor = "12 12 12 100"
+            size = "0 1 100% 100%-1"
+        />
+    </sprite>
     <sprite name="ModernDarkBoxWhite">
         <!-- borders -->
         <image texture = "global/modern/white-separator.png"
@@ -729 +745 @@
             size="0 6 16 22"
         />
     </sprite>
+    <sprite name = "ModernDropDownArrowDisabled">
+        <effect grayscale=""/>
+        <image texture = "global/modern/dropdown-arrow.png"
+            real_texture_placement = "0 0 16 16"
+            texture_size="0 0 16 16"
+            size="0 6 16 22"
+        />
+    </sprite>
     <sprite name = "ModernNotSorted">
         <image texture = "global/modern/arrow-up-down.png"
             real_texture_placement = "0 0 16 16"

binaries/data/mods/mod/gui/common/modern/styles.xml

@@ -59 +59 @@
         text_valign="center"
 
         sprite="ModernDarkBoxGold"
+        sprite_disabled="ModernDarkBoxGoldDisabled"
         button_width="16"
         sprite2="ModernDropDownArrow"
+        sprite2_disabled="ModernDropDownArrowDisabled"
         sprite2_pressed="ModernDropDownArrowHighlight"
 
         buffer_zone="8"
@@ -68 +70 @@
         sprite_list="BlackBorderOnGray"
         sprite_selectarea="ModernDarkBoxWhite"
         textcolor_selected="white"
+        textcolor_disabled="140 140 140 255"
 
         scrollbar="true"
         scrollbar_style="ModernScrollBar"
@@ -79 +82 @@
     <style name="ModernLabelText"
         font="sans-bold-stroke-14"
         textcolor="white"
+        textcolor_disabled="140 140 140 255"
         text_align="center"
         text_valign="center"
     />

binaries/data/mods/public/gui/options/options.js

@@ -21 +21 @@
             let config = option.parameters.config;
             g_Controls[config] = {
                 "control": setupControl(option, i, category),
+                "label": label,
                 "type": option.type,
                 "dependencies": option.dependencies || undefined,
                 "parameters": option.parameters
@@ -247 +248 @@
             continue;
 
         for (let dependency of control.dependencies)
+        {
             g_Controls[dependency].control.enabled = control.control.checked;
+            g_Controls[dependency].label.enabled = control.control.checked;
+        }
     }
 
     // And main buttons

source/gui/CDropDown.cpp

@@ -37 +37 @@
     AddSetting(GUIST_CStrW,                 "sound_enter");
     AddSetting(GUIST_CStrW,                 "sound_leave");
     AddSetting(GUIST_CStrW,                 "sound_opened");
-//  AddSetting(GUIST_CGUISpriteInstance,    "sprite");              // Background that sits around the size
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite");              // Background that sits around the size
+    AddSetting(GUIST_CGUISpriteInstance,    "sprite_disabled");
     AddSetting(GUIST_CGUISpriteInstance,    "sprite_list");         // Background of the drop down list
     AddSetting(GUIST_CGUISpriteInstance,    "sprite2");             // Button that sits to the right
     AddSetting(GUIST_CGUISpriteInstance,    "sprite2_over");
@@ -48 +49 @@
     // Add these in CList! And implement TODO
     //AddSetting(GUIST_CColor,              "textcolor_over");
     //AddSetting(GUIST_CColor,              "textcolor_pressed");
-    //AddSetting(GUIST_CColor,              "textcolor_disabled");
+    AddSetting(GUIST_CColor,                "textcolor_selected");
+    AddSetting(GUIST_CColor,                "textcolor_disabled");
 
     // Scrollbar is forced to be true.
     GUI<bool>::SetSetting(this, "scrollbar", true);
@@ -442 +444 @@
     int cell_id, selected = 0;
     CColor color;
 
-    GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
+    bool enabled;
+    GUI<bool>::GetSetting(this, "enabled", enabled);
+
     GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2", sprite2);
     GUI<int>::GetSetting(this, "cell_id", cell_id);
     GUI<int>::GetSetting(this, "selected", selected);
-    GUI<CColor>::GetSetting(this, "textcolor", color);
+    GUI<CColor>::GetSetting(this, enabled ? "textcolor_selected" : "textcolor_disabled", color);
 
-
-    bool enabled;
-    GUI<bool>::GetSetting(this, "enabled", enabled);
-
+    GUI<CGUISpriteInstance>::GetSettingPointer(this, enabled ? "sprite" : "sprite_disabled", sprite);
     GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
 
     if (button_width > 0.f)

source/gui/CText.cpp

@@ -1 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -38 +38 @@
     AddSetting(GUIST_EAlign,                "text_align");
     AddSetting(GUIST_EVAlign,               "text_valign");
     AddSetting(GUIST_CColor,                "textcolor");
+    AddSetting(GUIST_CColor,                "textcolor_disabled");
     AddSetting(GUIST_CStrW,                 "tooltip");
     AddSetting(GUIST_CStr,                  "tooltip_style");
 
@@ -229 +230 @@
         }
     }
 
+    bool enabled;
+    GUI<bool>::GetSetting(this, "enabled", enabled);
+
     CColor color;
-    GUI<CColor>::GetSetting(this, "textcolor", color);
+    GUI<CColor>::GetSetting(this, enabled ? "textcolor" : "textcolor_disabled", color);
 
     if (scrollbar)
         DrawText(0, color, m_CachedActualSize.TopLeft() - CPos(0.f, scroll), bz+0.1f, cliparea);