Ticket #4350: 4350_dropdown_label.patch
File 4350_dropdown_label.patch, 5.1 KB (added by , 7 years ago) |
---|
-
binaries/data/mods/mod/gui/common/modern/sprites.xml
199 199 size = "0 1 100% 100%-1" 200 200 /> 201 201 </sprite> 202 <sprite name="ModernDarkBoxGoldDisabled"> 203 <effect grayscale=""/> 204 <!-- borders --> 205 <image texture = "global/modern/gold-separator.png" 206 real_texture_placement = "0 0 806 1" 207 size = "0 0 100% 1" 208 /> 209 <image texture = "global/modern/gold-separator.png" 210 real_texture_placement = "0 0 806 1" 211 size = "0 100%-1 100% 100%" 212 /> 213 <!-- background --> 214 <image backcolor = "12 12 12 100" 215 size = "0 1 100% 100%-1" 216 /> 217 </sprite> 202 218 <sprite name="ModernDarkBoxWhite"> 203 219 <!-- borders --> 204 220 <image texture = "global/modern/white-separator.png" … … 729 745 size="0 6 16 22" 730 746 /> 731 747 </sprite> 748 <sprite name = "ModernDropDownArrowDisabled"> 749 <effect grayscale=""/> 750 <image texture = "global/modern/dropdown-arrow.png" 751 real_texture_placement = "0 0 16 16" 752 texture_size="0 0 16 16" 753 size="0 6 16 22" 754 /> 755 </sprite> 732 756 <sprite name = "ModernNotSorted"> 733 757 <image texture = "global/modern/arrow-up-down.png" 734 758 real_texture_placement = "0 0 16 16" -
binaries/data/mods/mod/gui/common/modern/styles.xml
59 59 text_valign="center" 60 60 61 61 sprite="ModernDarkBoxGold" 62 sprite_disabled="ModernDarkBoxGoldDisabled" 62 63 button_width="16" 63 64 sprite2="ModernDropDownArrow" 65 sprite2_disabled="ModernDropDownArrowDisabled" 64 66 sprite2_pressed="ModernDropDownArrowHighlight" 65 67 66 68 buffer_zone="8" … … 79 81 <style name="ModernLabelText" 80 82 font="sans-bold-stroke-14" 81 83 textcolor="white" 84 textcolor_disabled="140 140 140 255" 82 85 text_align="center" 83 86 text_valign="center" 84 87 /> -
binaries/data/mods/public/gui/options/options.js
21 21 let config = option.parameters.config; 22 22 g_Controls[config] = { 23 23 "control": setupControl(option, i, category), 24 "label": label, 24 25 "type": option.type, 25 26 "dependencies": option.dependencies || undefined, 26 27 "parameters": option.parameters … … 247 248 continue; 248 249 249 250 for (let dependency of control.dependencies) 251 { 250 252 g_Controls[dependency].control.enabled = control.control.checked; 253 g_Controls[dependency].label.enabled = control.control.checked; 254 } 251 255 } 252 256 253 257 // And main buttons -
source/gui/CDropDown.cpp
37 37 AddSetting(GUIST_CStrW, "sound_enter"); 38 38 AddSetting(GUIST_CStrW, "sound_leave"); 39 39 AddSetting(GUIST_CStrW, "sound_opened"); 40 // AddSetting(GUIST_CGUISpriteInstance, "sprite"); // Background that sits around the size 40 AddSetting(GUIST_CGUISpriteInstance, "sprite"); // Background that sits around the size 41 AddSetting(GUIST_CGUISpriteInstance, "sprite_disabled"); 41 42 AddSetting(GUIST_CGUISpriteInstance, "sprite_list"); // Background of the drop down list 42 43 AddSetting(GUIST_CGUISpriteInstance, "sprite2"); // Button that sits to the right 43 44 AddSetting(GUIST_CGUISpriteInstance, "sprite2_over"); … … 442 443 int cell_id, selected = 0; 443 444 CColor color; 444 445 445 GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);446 446 GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2", sprite2); 447 447 GUI<int>::GetSetting(this, "cell_id", cell_id); 448 448 GUI<int>::GetSetting(this, "selected", selected); … … 452 452 bool enabled; 453 453 GUI<bool>::GetSetting(this, "enabled", enabled); 454 454 455 GUI<CGUISpriteInstance>::GetSettingPointer(this, enabled ? "sprite" : "sprite_disabled", sprite); 455 456 GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize); 456 457 457 458 if (button_width > 0.f) -
source/gui/CText.cpp
38 38 AddSetting(GUIST_EAlign, "text_align"); 39 39 AddSetting(GUIST_EVAlign, "text_valign"); 40 40 AddSetting(GUIST_CColor, "textcolor"); 41 AddSetting(GUIST_CColor, "textcolor_disabled"); 41 42 AddSetting(GUIST_CStrW, "tooltip"); 42 43 AddSetting(GUIST_CStr, "tooltip_style"); 43 44 … … 229 230 } 230 231 } 231 232 233 bool enabled; 234 GUI<bool>::GetSetting(this, "enabled", enabled); 235 232 236 CColor color; 233 GUI<CColor>::GetSetting(this, "textcolor", color);237 GUI<CColor>::GetSetting(this, enabled ? "textcolor" : "textcolor_disabled", color); 234 238 235 239 if (scrollbar) 236 240 DrawText(0, color, m_CachedActualSize.TopLeft() - CPos(0.f, scroll), bz+0.1f, cliparea);