Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Change color of disabled labels and dropdowns, patch by vladislavbelov, fixes #4350

Browse Source 
This was SVN commit r19020.
This commit is contained in:
mimo 2016-12-05 17:21:51 +00:00
parent da2a021b64
commit fe77783145
5 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
binaries/data/mods/mod/gui/common/modern/sprites.xml
View File

@ -199,6 +199,22 @@
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,6 +745,14 @@
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"

4
binaries/data/mods/mod/gui/common/modern/styles.xml
View File

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

4
binaries/data/mods/public/gui/options/options.js
View File

@ -21,6 +21,7 @@ function init(data)
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,7 +248,10 @@ function updateOptionPanel()
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

19
source/gui/CDropDown.cpp
View File

@ -37,7 +37,8 @@ CDropDown::CDropDown()
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,7 +49,8 @@ CDropDown::CDropDown()
// 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);
@ -440,16 +442,15 @@ void CDropDown::Draw()
int cell_id, selected = 0;
CColor color;
GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
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);
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, enabled ? "textcolor_selected" : "textcolor_disabled", color);
GUI<CGUISpriteInstance>::GetSettingPointer(this, enabled ? "sprite" : "sprite_disabled", sprite);
GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
if (button_width > 0.f)

8
source/gui/CText.cpp
View File

@ -1,4 +1,4 @@
/* 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,6 +38,7 @@ CText::CText()
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,8 +230,11 @@ void CText::Draw()
}
}
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);