From 4c26a2d11f5b373b68adc778e66eda4d6ca93b6c Mon Sep 17 00:00:00 2001
From: vladislavbelov <vladislavbelov@wildfiregames.com>
Date: Sat, 27 Nov 2021 13:37:05 +0000
Subject: [PATCH] Adds disabled sprites to slider.

Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D4355
This was SVN commit r26019.
---
 .../data/mods/mod/gui/common/modern/sprites.xml    | 14 ++++++++++++++
 .../data/mods/mod/gui/common/modern/styles.xml     |  2 ++
 binaries/data/mods/mod/gui/gui.rng                 |  7 +++++--
 source/gui/ObjectTypes/CSlider.cpp                 | 12 +++++++-----
 source/gui/ObjectTypes/CSlider.h                   |  4 ++--
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/binaries/data/mods/mod/gui/common/modern/sprites.xml b/binaries/data/mods/mod/gui/common/modern/sprites.xml
index fc584c4ea9..ef2146cd80 100644
--- a/binaries/data/mods/mod/gui/common/modern/sprites.xml
+++ b/binaries/data/mods/mod/gui/common/modern/sprites.xml
@@ -684,12 +684,26 @@
 			size="50%-10 50%-10 50%+11 50%+11"
 		/>
 	</sprite>
+	<sprite name="ModernSliderButtonDisabled">
+		<effect grayscale=""/>
+		<image texture="global/modern/tick-on.png"
+			real_texture_placement="0 0 27 27"
+			size="50%-10 50%-10 50%+11 50%+11"
+		/>
+	</sprite>
 	<sprite name="ModernSliderLine">
 		<image texture="global/modern/gold-separator.png"
 			real_texture_placement="0 0 806 1"
 			size="0 50%-1 100% 50%+1"
 		/>
 	</sprite>
+	<sprite name="ModernSliderLineDisabled">
+		<effect grayscale=""/>
+		<image texture="global/modern/gold-separator.png"
+			real_texture_placement="0 0 806 1"
+			size="0 50%-1 100% 50%+1"
+		/>
+	</sprite>
 
 	<sprite name="ModernArrowDownRed">
 		<effect add_color="123 53 53"/>
diff --git a/binaries/data/mods/mod/gui/common/modern/styles.xml b/binaries/data/mods/mod/gui/common/modern/styles.xml
index 6d83545ba1..399147adc6 100644
--- a/binaries/data/mods/mod/gui/common/modern/styles.xml
+++ b/binaries/data/mods/mod/gui/common/modern/styles.xml
@@ -152,7 +152,9 @@
 	/>
 	<style name="ModernSlider"
 		sprite="ModernSliderButton"
+		sprite_disabled="ModernSliderButtonDisabled"
 		sprite_bar="ModernSliderLine"
+		sprite_bar_disabled="ModernSliderLineDisabled"
 		button_width="20"
 		tooltip_style="tooltipInstant"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
diff --git a/binaries/data/mods/mod/gui/gui.rng b/binaries/data/mods/mod/gui/gui.rng
index dfb3d9204b..49f06af370 100644
--- a/binaries/data/mods/mod/gui/gui.rng
+++ b/binaries/data/mods/mod/gui/gui.rng
@@ -395,13 +395,13 @@
         <attribute name="sprite_asc"/>
       </optional>
       <optional>
-        <attribute name="sprite_heading"/>
+        <attribute name="sprite_background"/>
       </optional>
       <optional>
         <attribute name="sprite_bar"/>
       </optional>
       <optional>
-        <attribute name="sprite_background"/>
+        <attribute name="sprite_bar_disabled"/>
       </optional>
       <optional>
         <attribute name="sprite_desc"/>
@@ -409,6 +409,9 @@
       <optional>
         <attribute name="sprite_disabled"/>
       </optional>
+      <optional>
+        <attribute name="sprite_heading"/>
+      </optional>
       <optional>
         <attribute name="sprite_list"/>
       </optional>
diff --git a/source/gui/ObjectTypes/CSlider.cpp b/source/gui/ObjectTypes/CSlider.cpp
index aee5b41c4d..7d956a0089 100644
--- a/source/gui/ObjectTypes/CSlider.cpp
+++ b/source/gui/ObjectTypes/CSlider.cpp
@@ -31,7 +31,9 @@ CSlider::CSlider(CGUI& pGUI)
 	  m_MaxValue(this, "max_value"),
 	  m_MinValue(this, "min_value"),
 	  m_Sprite(this, "sprite"),
+	  m_SpriteDisabled(this, "sprite_disabled"),
 	  m_SpriteBar(this, "sprite_bar"),
+	  m_SpriteBarDisabled(this, "sprite_bar_disabled"),
 	  m_Value(this, "value")
 {
 	m_Value.Set(Clamp<float>(m_Value, m_MinValue, m_MaxValue), false);
@@ -104,11 +106,11 @@ void CSlider::HandleMessage(SGUIMessage& Message)
 
 void CSlider::Draw(CCanvas2D& canvas)
 {
-	CRect slider_line(m_CachedActualSize);
-	slider_line.left += m_ButtonSide / 2.0f;
-	slider_line.right -= m_ButtonSide / 2.0f;
-	m_pGUI.DrawSprite(m_SpriteBar, canvas, slider_line);
-	m_pGUI.DrawSprite(m_Sprite, canvas, GetButtonRect());
+	CRect sliderLine(m_CachedActualSize);
+	sliderLine.left += m_ButtonSide / 2.0f;
+	sliderLine.right -= m_ButtonSide / 2.0f;
+	m_pGUI.DrawSprite(IsEnabled() ? m_SpriteBar : m_SpriteBarDisabled, canvas, sliderLine);
+	m_pGUI.DrawSprite(IsEnabled() ? m_Sprite : m_SpriteDisabled, canvas, GetButtonRect());
 }
 
 void CSlider::UpdateValue()
diff --git a/source/gui/ObjectTypes/CSlider.h b/source/gui/ObjectTypes/CSlider.h
index 05f98637da..95237c1179 100644
--- a/source/gui/ObjectTypes/CSlider.h
+++ b/source/gui/ObjectTypes/CSlider.h
@@ -64,8 +64,8 @@ protected:
 	CGUISimpleSetting<float> m_ButtonSide;
 	CGUISimpleSetting<float> m_MinValue;
 	CGUISimpleSetting<float> m_MaxValue;
-	CGUISimpleSetting<CGUISpriteInstance> m_Sprite;
-	CGUISimpleSetting<CGUISpriteInstance> m_SpriteBar;
+	CGUISimpleSetting<CGUISpriteInstance> m_Sprite, m_SpriteDisabled;
+	CGUISimpleSetting<CGUISpriteInstance> m_SpriteBar, m_SpriteBarDisabled;
 	CGUISimpleSetting<float> m_Value;
 
 private: