[vlc-commits] commit: Qt: appropriate SoundSlider size (Jakob Leben )

git at videolan.org git at videolan.org
Sat Mar 27 23:51:36 CET 2010


vlc | branch: master | Jakob Leben <jleben at videolan.org> | Sat Mar 27 15:41:05 2010 +0100| [02ee6240a9a2c0998054c5aaa6fcd945e63bf157] | committer: Jakob Leben 

Qt: appropriate SoundSlider size

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02ee6240a9a2c0998054c5aaa6fcd945e63bf157
---

 modules/gui/qt4/components/controller_widget.cpp |    5 -----
 modules/gui/qt4/util/input_slider.cpp            |    2 +-
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 095d875..cb77d31 100644
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -98,11 +98,6 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
         volumeSlider->setMaximum( var_InheritBool( p_intf, "qt-volume-complete" )
                                   ? 400 : 200 );
     }
-    if( volumeSlider->orientation() ==  Qt::Horizontal )
-    {
-        volumeSlider->setMaximumSize( QSize( 200, 40 ) );
-        volumeSlider->setMinimumSize( QSize( 85, 30 ) );
-    }
 
     volumeSlider->setFocusPolicy( Qt::NoFocus );
     if( b_special )
diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index 9d57d3e..19f6ad7 100644
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -173,7 +173,7 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard,
     const QPixmap temp( ":/toolbar/volslide-inside" );
     const QBitmap mask( temp.createHeuristicMask() );
 
-    setMinimumSize( pixOutside.size() );
+    setFixedSize( pixOutside.size() );
 
     pixGradient = QPixmap( mask.size() );
     pixGradient2 = QPixmap( mask.size() );



More information about the vlc-commits mailing list