[SCM] Audacity debian packaging branch, master, updated. debian/1.3.12-1-2-g916e6a7

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Sun Apr 4 16:35:35 UTC 2010


The following commit has been merged in the master branch:
commit 88a66e935616db70ed6f6b4e04905df7c8e05d19
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Sun Apr 4 17:54:36 2010 +0200

    Add fix-slider-background-color.patch to fix background color of sliders.

diff --git a/debian/patches/fix-slider-background-color.patch b/debian/patches/fix-slider-background-color.patch
new file mode 100644
index 0000000..2622b6e
--- /dev/null
+++ b/debian/patches/fix-slider-background-color.patch
@@ -0,0 +1,23 @@
+Description: Fix background color of sliders
+Author: Benjamin Drung <bdrung at ubuntu.com>
+Forwarded: yes
+
+--- audacity-1.3.12.orig/src/widgets/ASlider.cpp
++++ audacity-1.3.12/src/widgets/ASlider.cpp
+@@ -62,6 +62,7 @@ of an LWSlider or ASlider.
+ #include <wx/button.h>
+ #include <wx/statline.h>
+ #include <wx/sizer.h>
++#include <wx/settings.h>
+ 
+ #if defined(__WXMSW__) && !defined(__CYGWIN__)
+ #define USE_POPUPWIN 1
+@@ -674,7 +675,7 @@ void LWSlider::Draw()
+    TransparentColour = theTheme.Colour( clrTrackInfo );
+ #endif
+ 
+-   dc->SetBackground( wxBrush( TransparentColour  ) );
++   dc->SetBackground( wxBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_BACKGROUND ) ) );
+    dc->Clear();
+ 
+    // Draw the line along which the thumb moves.
diff --git a/debian/patches/series b/debian/patches/series
index 5eb78e0..eeee20b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 enable-experimental-linking.patch
+fix-slider-background-color.patch
diff --git a/src/widgets/ASlider.cpp b/src/widgets/ASlider.cpp
index 57b71ca..d7c2a24 100644
--- a/src/widgets/ASlider.cpp
+++ b/src/widgets/ASlider.cpp
@@ -62,6 +62,7 @@ of an LWSlider or ASlider.
 #include <wx/button.h>
 #include <wx/statline.h>
 #include <wx/sizer.h>
+#include <wx/settings.h>
 
 #if defined(__WXMSW__) && !defined(__CYGWIN__)
 #define USE_POPUPWIN 1
@@ -674,7 +675,7 @@ void LWSlider::Draw()
    TransparentColour = theTheme.Colour( clrTrackInfo );
 #endif
 
-   dc->SetBackground( wxBrush( TransparentColour  ) );
+   dc->SetBackground( wxBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_BACKGROUND ) ) );
    dc->Clear();
 
    // Draw the line along which the thumb moves.

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list