[vlc-commits] Qt: fix frame around time in toolbar editor

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Dec 13 17:09:49 2014 +0100| [1b6b699c56870bf6146926b53651a810813e16b7] | committer: Jean-Baptiste Kempf

Qt: fix frame around time in toolbar editor

Close #12888

(cherry picked from commit 9ecbe11b0d2a1c709b3bd8067450a007600ef6ca)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=1b6b699c56870bf6146926b53651a810813e16b7
---

 modules/gui/qt4/dialogs/toolbar.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/dialogs/toolbar.cpp b/modules/gui/qt4/dialogs/toolbar.cpp
index f102133..c1e667a 100644
--- a/modules/gui/qt4/dialogs/toolbar.cpp
+++ b/modules/gui/qt4/dialogs/toolbar.cpp
@@ -673,7 +673,7 @@ void DroppingController::createAndAddWidget( QBoxLayout *newControlLayout,
         widg->installEventFilter( this );
 
         /* We are in a complex widget, we need to stop events on children too */
-        if( i_type >= VOLUME && i_type < SPECIAL_MAX )
+        if( i_type >= TIME_LABEL && i_type < SPECIAL_MAX )
         {
             QList<QObject *>children = widg->children();
 
@@ -690,7 +690,7 @@ void DroppingController::createAndAddWidget( QBoxLayout *newControlLayout,
 
             /* Decorating the frames when possible */
             QFrame *frame;
-            if( i_type >= MENU_BUTTONS  /* Don't bother to check for volume */
+            if( (i_type >= MENU_BUTTONS || i_type == TIME_LABEL) /* Don't bother to check for volume */
                 && ( frame = qobject_cast<QFrame *>( widg ) ) != NULL )
             {
                 frame->setFrameStyle( QFrame::Panel | QFrame::Raised );