From b7718838bd25a73ea21e9d61f8bdb0267cb3cbbc Mon Sep 17 00:00:00 2001
From: Cyril Deguet <asmax@videolan.org>
Date: Sun, 30 Apr 2006 13:12:34 +0000
Subject: [PATCH] * all: added a SliderBackground to the volume slider of the
 default skin  (fixes an incorrect behaviour when clicking on the white part
 of the slider)

---
 share/Makefile.am                        |   1 +
 share/skins2/default/main/vol_bg.png     | Bin 0 -> 7912 bytes
 share/skins2/default/main/vol_slider.png | Bin 222 -> 180 bytes
 share/skins2/default/theme.xml           |  15 +++++++--------
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 share/skins2/default/main/vol_bg.png

diff --git a/share/Makefile.am b/share/Makefile.am
index b78e22c171..fdcaeea1e9 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -89,6 +89,7 @@ skins2_default_vlt_FILES = \
         skins2/default/main/main_over.png \
         skins2/default/main/pause_down.png \
         skins2/default/main/dvd_prevchapter.png \
+        skins2/default/main/vol_bg.png \
         skins2/default/main/vol_mask.png \
         skins2/default/main/vol_slider.png \
         skins2/default/main/dvd_menu.png \
diff --git a/share/skins2/default/main/vol_bg.png b/share/skins2/default/main/vol_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..79fbb88e260b3b69f7d8a66aa6200bda0f30dc53
GIT binary patch
literal 7912
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

literal 0
HcmV?d00001

diff --git a/share/skins2/default/main/vol_slider.png b/share/skins2/default/main/vol_slider.png
index 998d9cae60edd811c61676b4f71f8c36eb048c46..b6583311bf62f2911106d8694549dc63c51d5237 100644
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^OhC-X!3HE*OU}jvDYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>FdgVjYW=^S^LnQS9(ApM^6{W5RU7qCpYpQP~dSrI6Wa*
z>HU7bnJ0O5HTSK!G`Hls^>eljXIKuryT)Q&P`+?gi-fZT`}u?Wm7HGe<<8b+usgbe
Vi&d*((Iuc^44$rjF6*2UngB_pH&y@u

literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^WkAfw!3HFMU3;+?NU@|l`Z_W&tUqDS+Vv91mn?CO
zC<)F_D=AMbN@Z|N$xljE@XSq2PYp^<OsOn9nQ8-6RN(327*cWT&6Sh92NVRH139vf
zG){AR93U*d&Qo%t&3)M${>F7@e_AP59{Uis>)5qf%1s->Io2%TkZ!!%;;Xr_N$JhK
z*`gwe-fMwk(Lk}ijZZ~|;|zcPP4Z4;b-gjiSX<-Jyy7!c-tL|K@)xH8gZWpkuO~K4
RdkD0f!PC{xWt~$(695;QRSEzA

diff --git a/share/skins2/default/theme.xml b/share/skins2/default/theme.xml
index 597a61d7a6..1bacf88569 100644
--- a/share/skins2/default/theme.xml
+++ b/share/skins2/default/theme.xml
@@ -48,7 +48,6 @@
 		<SubBitmap x="326" y="258" width="30" height="24" id="eq_up"/>
 		
 		<SubBitmap x="360" y="258" width="14" height="24" id="mute_up"/>
-		<SubBitmap x="374" y="258" width="70" height="24" id="volume_bg"/>
 	</Bitmap>
 		<Bitmap id="main_over" file="main/main_over.png" alphacolor="#FF00FF">
 		<SubBitmap x="408" y="2" width="34" height="11" id="close_over"/>
@@ -117,6 +116,7 @@
 	<Bitmap file="main/dvd_nextchapter.png" id="dvd_nextchapter" alphacolor="#FF00FF"/>
 	<Bitmap file="main/dvd_nexttitle.png" id="dvd_nexttitle" alphacolor="#FF00FF"/>
 	<Bitmap file="main/vol_mask.png" id="vol_mask" alphacolor="#FF00FF"/>
+	<Bitmap file="main/vol_bg.png" id="vol_bg" alphacolor="#FF00FF"/>
 	<Bitmap file="main/vol_slider.png" id="vol_slider" alphacolor="#FF00FF"/>
 	<!--The Playlist Images-->
 	<Bitmap file="playlist/playlist.png" id="playlist_blank" alphacolor="#FF00FF">
@@ -226,10 +226,10 @@
 		
 		<Slider x="26" y="226" points="(0,0),(400,0)" up="timeslider" value="time" lefttop="leftbottom" rightbottom="rightbottom"/>
 		
-		<Image x="324" y="258" image="volume_bg" lefttop="leftbottom" rightbottom="leftbottom"/>
-		<Slider x="327" y="269" points="(0,0),(58,0)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom"/>
+		<Slider x="310" y="259" points="(17,10),(75,10)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom">
+            <SliderBackground image="vol_bg" x="310" y="259" nbvert="55"/>
+		</Slider>
 		<Image x="269" y="259" image="vol_mask" lefttop="leftbottom" rightbottom="leftbottom"/>
-		
 		<!--The Buttons-->
 		<Checkbox x="18" y="251" up1="play_up" over1="play_over" down1="play_down" up2="pause_up" over2="pause_over" down2="pause_down" action1="vlc.play()" action2="vlc.pause()" state="vlc.isPlaying" lefttop="leftbottom" rightbottom="leftbottom"/>
 		
@@ -357,10 +357,9 @@
 		<Button x="94" y="64" up="stop_up" over="stop_over" down="stop_down" action="vlc.stop()" tooltiptext="Stop Playing" lefttop="leftbottom" rightbottom="leftbottom"/>
 		<Button x="110" y="64" up="fast_up" over="fast_over" down="fast_down" action="vlc.faster()" tooltiptext="Play Faster" lefttop="leftbottom" rightbottom="leftbottom"/>
 		<Button x="128" y="64" up="next_up" over="next_over" down="next_down" action="playlist.next()" tooltiptext="Play Next Item in the Playlist" lefttop="leftbottom" rightbottom="leftbottom"/>
-		
-
-		<Image x="229" y="64" image="volume_bg" lefttop="leftbottom" rightbottom="leftbottom"/>
-		<Slider x="231" y="75" points="(0,0),(58,0)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom"/>
+		<Slider x="214" y="65" points="(17,10),(75,10)" up="vol_slider" value="volume" tooltiptext="Volume: $V%" lefttop="leftbottom" rightbottom="leftbottom">
+            <SliderBackground image="vol_bg" x="310" y="259" nbvert="55"/>
+		</Slider>
 		<Image x="173" y="65" image="vol_mask" lefttop="leftbottom" rightbottom="leftbottom"/>
 		<Button x="215" y="64" up="mute_up" over="mute_over" down="mute_down" action="vlc.mute()" tooltiptext="Mute" lefttop="leftbottom" rightbottom="leftbottom"/>
 				
-- 
2.39.2