[SCM] audacity/experimental: Pick up upstream improvements to the slider background color patch.

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Thu Nov 25 22:31:24 UTC 2010


The following commit has been merged in the experimental branch:
commit 0c2b2b56b3ec385f20e43fd017fda829cc4456fc
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Thu Nov 25 22:59:43 2010 +0100

    Pick up upstream improvements to the slider background color patch.

diff --git a/debian/patches/fix-slider-background-color.patch b/debian/patches/fix-slider-background-color.patch
index c8e9db1..7fa6504 100644
--- a/debian/patches/fix-slider-background-color.patch
+++ b/debian/patches/fix-slider-background-color.patch
@@ -12,12 +12,17 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=175
  
  #if defined(__WXMSW__) && !defined(__CYGWIN__)
  #define USE_POPUPWIN 1
-@@ -674,7 +675,7 @@ void LWSlider::Draw()
-    TransparentColour = theTheme.Colour( clrTrackInfo );
+@@ -572,6 +573,13 @@ void LWSlider::OnPaint(wxDC &dc, bool se
+       dc.Clear();
+    }
  #endif
++#if defined(__WXGTK__)
++   if (mHW)
++   {
++      dc.SetBackground(wxSystemSettings::GetColour(wxSYS_COLOUR_BACKGROUND));
++      dc.Clear();
++   }
++#endif
  
--   dc->SetBackground( wxBrush( TransparentColour  ) );
-+   dc->SetBackground( wxBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_BACKGROUND ) ) );
-    dc->Clear();
- 
-    // Draw the line along which the thumb moves.
+    dc.DrawBitmap(*mBitmap, mLeft, mTop, true);
+    if (mOrientation == wxHORIZONTAL)

-- 
Audacity debian packaging



More information about the pkg-multimedia-commits mailing list