Skip to content

V
vlc-gpu
Commit ee3754df authored by Ludovic Fauvet's avatar Ludovic Fauvet Committed by Jean-Baptiste Kempf
Browse files
Options

Qt: Fix corner-case with some top level windows 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 744bf6f3
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
modules/gui/qt4/util/input_slider.cpp
View file @ ee3754df
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
#include <QColor> #include <QColor>
#include <QPoint> #include <QPoint>
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QApplication>
#define MINIMUM 0 #define MINIMUM 0
#define MAXIMUM 1000 #define MAXIMUM 1000
...@@ -291,16 +292,23 @@ void SeekSlider::enterEvent( QEvent * ) ...@@ -291,16 +292,23 @@ void SeekSlider::enterEvent( QEvent * )
animHandle->setDirection( QAbstractAnimation::Forward ); animHandle->setDirection( QAbstractAnimation::Forward );
animHandle->start(); animHandle->start();
} }
/* Don't show the tooltip if the slider is disabled */ /* Don't show the tooltip if the slider is disabled or a menu is open */
if( isEnabled() && inputLength > 0 ) if( isEnabled() && inputLength > 0 && !qApp->activePopupWidget() )
mTimeTooltip->show(); mTimeTooltip->show();
} }
void SeekSlider::leaveEvent( QEvent * ) void SeekSlider::leaveEvent( QEvent * )
{ {
hideHandleTimer->start(); hideHandleTimer->start();
if( !rect().contains( mapFromGlobal( QCursor::pos() ) ) ) /* Hide the tooltip
- if the mouse leave the slider rect (Note: it can still be
over the tooltip!)
- if another window is on the way of the cursor */
if( !rect().contains( mapFromGlobal( QCursor::pos() ) ) ||
( !isActiveWindow() && !mTimeTooltip->isActiveWindow() ) )
{
mTimeTooltip->hide(); mTimeTooltip->hide();
}
} }
void SeekSlider::hideEvent( QHideEvent * ) void SeekSlider::hideEvent( QHideEvent * )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment