From 8b583911d65e77f365dd882816616c968864fa88 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Tue, 11 Dec 2007 23:24:57 +0000 Subject: [PATCH] Qt4 - Slightly smaller sound slider and fix the padding between mouse and shape. --- .../gui/qt4/pixmaps/volume-slider-inside.png | Bin 263 -> 270 bytes .../gui/qt4/pixmaps/volume-slider-outside.png | Bin 1083 -> 1009 bytes modules/gui/qt4/util/input_slider.cpp | 22 ++++++++++-------- modules/gui/qt4/util/input_slider.hpp | 3 ++- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/gui/qt4/pixmaps/volume-slider-inside.png b/modules/gui/qt4/pixmaps/volume-slider-inside.png index 91e84df90b3cee471bbdd8bf6a972a3466fa0c96..fc11897880758a9e7159bea8ead67f3c3e3298b1 100644 GIT binary patch delta 224 zcmV<603ZK{0*(S9iBL{Q4GJ0x0000DNk~Le0001D0000U2nGNE0M|v!w2>h=f1pW3 zK~#9!?3zIifFKM6E$RQiTtDCeBXtX%xx-;5)C9DMxIoW9K@I%#4%XaYOnZulwYDw< z%!^Mw5%5|%Au@*2qR~uw&`GjaK{=^VR+*&%~3DH{o zE+N`Ik~rdfhu~RI6aw+05QrCrHbA^2gdtuN0`bBS$p4i=gvueH$Y_f8zm0Js2mw-V a0R{k+3LaU!X1J*r%*+9mt=(5Drve1E=myRf+OC--3i{m|n)uTygGurH0z z*mv*6f`7c9Z(Lk{JJ7+jiSa56TZphk0B-=06DhgsYwXPyCN7>8xjVK0bFzs{neN!g z+0rD$!>TUA<)a}o!(s)azN#>nkAcXX6J;K<3$HwRp?zNSZy?iFCwWFT219na@FT(M RWkA<5c)I$ztaD0e0s#DVPAmWb diff --git a/modules/gui/qt4/pixmaps/volume-slider-outside.png b/modules/gui/qt4/pixmaps/volume-slider-outside.png index f2d52fb239e2d532410431c54d69fab0d16b8e62..3b04c55d01bcb618455ac659b53e132494777842 100644 GIT binary patch delta 969 zcmV;)12+7-2=NCYiBL{Q4GJ0x0000DNk~Le0001D0000U2nGNE0M|v!w2>h=e}hRx zK~#9!?3znR8&MR7O=e7W$YaK4CJ%{;8mmQYl#&dJ5;X=|73xC7O}iD>rFPRrU3F1P zOE)3iba}OLQkeivw_urZO zpTpJd?Cccf5(9(%MI??NuV0O&e~)yoCyGX*gyw(5(C|<>9Dv?z+BbMtfMlarIfL^?H4?*=&|ELD(qyCe<@|wd4Zp<^i+Nfg+k9kgkN~*7Yu&$r0#_-Fz}TadV1EE zl$4~bRx1J@Yiny8b62>Ncqm$E=OKTd*1gf^9Q>{#>HJ=4He-^W4#^H3t4l1G` zziais(0K-aua_555oNR4q^8EEqlzd^2b~A-GkW>H8-0)Puq{X_+aihxakQoEQF!^) zL%jU#d0F3R4S?TgDPhKc@VGs(j`oh1PN#F@w7h&l2?5~k^5S}grCh=@exnd-9QqW% zE8D|8U?~N(z(Vmff2DOxnb$(>X%B}fin=Vfhy8y46PWeO`C=*aP6&Xnw3MxKd$^&Y z;YGMBEO#Z*yZsa7D#5Oj5Cen#S7l3y62LF=R$lUYy>EMadY>xV!>BL6NHD7;1c3L- ziz@=pFw7dy^RWZElndBarU+VfB>j*Hp;TB2v+i) z7!dE(*Vq5RU!QrGvXGvL;p(btZsg9$efazhziRecNGFzgX-k1hC|hk)1X3&zNtDRR1y5cHXCsL>y=bBrJt#ph zCdS051P^-95HDQ3cp;>|Rz!#ts;DR=MKfAC-6W9W<2 zuaU1TuSnr>m4Qke7zYIDt5{bm8QmF);PA6E4 ztb)(yds=?5d=|rFsMIEte{n4g)Os-MByvtpjzXh>YT=C`r_(vme!TrE6&}Ia@;w#T z#$_-Rop|VrC30;|?F@!5B9zf|T`!kGU}%Y4mz|w$CK8!9@WS6DG7kS;Vcb52BBLtB zFP6wIm+MAjLu2G05_wk{w@<(vpuvDd_9~T10TxQ3xVU&DiA>bkfAn7Z8@W9SrW~QP z;?UQV-Gw*uAy8rBp`S2`%s_1pC0pFa^7HeTh#Iq5ZNs8Xe;Eh@IejeYn29{&8tZ>5rXm`V7?nAHf6&98hCcqQ+o%36_+Uyl6Yxc2l8HtYG*g zwz0WPTPL_Qfbk-fe+E2);m8q;$!r>_uByHTga0Fjt|F8%Y-t&7T#}(E={AN-Wz=9W zj981TA+N{#yt1BWlk|cwo&c^&GlPifDGw_BW$mF5Gk-%MOX+JT18mr|S z!;pMXE`Sq=R}9ExHBn=Q#=>AlMa2V{FSPoKFO>@{?a2j|e=BNZezNU@8XGCH6b0S2 z?kgUT=M%;*U>h4}DNa5pUL=$2$q_$n`$3z{_6FM6eQMjE!NEVnQkoi2$G|%YocRCs zjYeazthDS|$BB+>RNMqsOpK*4wV+7#TrMamI1J0=klXDRZ~J7ngju@M52_mgX?rg8 zTtXE_+Sq4NX{?l`D`jSlMx!cP5ywG|&d<-cPEAe8VeXKhbu3ruv)S3%-2Q?7bMUk` z{+fikrJ0;KlNu|?>U=0d&GVVFaRoF9}jG$7G?kd N002ovPDHLkV1k5I@t^x() - padding ); + changeValue( event->x() - paddingL ); } } @@ -150,7 +151,7 @@ void SoundSlider::mouseMoveEvent( QMouseEvent *event ) { if( b_sliding ) { - QRect rect( padding - 15, padding - 1, + QRect rect( paddingL - 15, -1, WLENGTH + 15 * 2, WHEIGHT + 4 ); if( !rect.contains( event->pos() ) ) { /* We are outside */ @@ -161,7 +162,7 @@ void SoundSlider::mouseMoveEvent( QMouseEvent *event ) else { /* We are inside */ b_outside = false; - changeValue( event->x() - padding ); + changeValue( event->x() - paddingL ); emit sliderMoved( value() ); } } @@ -171,14 +172,15 @@ void SoundSlider::mouseMoveEvent( QMouseEvent *event ) void SoundSlider::changeValue( int x ) { - setValue( QStyle::sliderValueFromPosition( - minimum(), maximum(), x, width() - 2 * padding ) ); + setValue( x * maximum() / WLENGTH ); } void SoundSlider::paintEvent(QPaintEvent *e) { QPainter painter( this ); - const int offset = int( double( ( width() - 2 * padding ) * value() ) / maximum() ); + const int offset = int( + double( WLENGTH * value() ) / + double( maximum() ) ) + paddingL; const QRectF boundsG( 0, 0, offset , pixGradient.height() ); painter.drawPixmap( boundsG, pixGradient, boundsG ); diff --git a/modules/gui/qt4/util/input_slider.hpp b/modules/gui/qt4/util/input_slider.hpp index dad1e36ef4..318fbe945a 100644 --- a/modules/gui/qt4/util/input_slider.hpp +++ b/modules/gui/qt4/util/input_slider.hpp @@ -57,7 +57,8 @@ public: SoundSlider( QWidget *_parent, int _i_step, bool b_softamp ); virtual ~SoundSlider() {}; protected: - int padding; + int paddingL; + int paddingR; virtual void paintEvent(QPaintEvent *); virtual void wheelEvent( QWheelEvent *event ); virtual void mousePressEvent( QMouseEvent * ); -- 2.20.1