Changeset 181 for smplayer/trunk/src/autohidewidget.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/autohidewidget.cpp (modified) (7 diffs)

smplayer/trunk/src/autohidewidget.cpp

@@ -22 +22 @@
 #include <QVBoxLayout>
 #include <QMouseEvent>
+#include <QAction>
+#include <QMenu>
 #include <QDebug>
 
 #if QT_VERSION >= 0x040600
 #include <QPropertyAnimation>
+#endif
+
+#define HANDLE_TAP_EVENT
+
+#ifdef HANDLE_TAP_EVENT
+#include <QGestureEvent>
 #endif
 
@@ -46 +54 @@
         setLayoutDirection(Qt::LeftToRight);
 
-        parent->installEventFilter(this);
-        installFilter(parent);
+        QWidget * widget_to_watch = parent;
+        widget_to_watch->installEventFilter(this);
+        installFilter(widget_to_watch);
 
         timer = new QTimer(this);
@@ -66 +75 @@
 
 void AutohideWidget::setInternalWidget(QWidget * w) {
+        //qDebug() << "AutohideWidget::setInternalWidget:" << w;
         layout()->addWidget(w);
         internal_widget = w;
@@ -87 +97 @@
                         w->installEventFilter(this);
                         installFilter(children[n]);
-                }
-        }
+                        #ifdef HANDLE_TAP_EVENT
+                        //w->grabGesture(Qt::TapGesture);
+                        #endif
+                }
+        }
+}
+
+bool AutohideWidget::visiblePopups() {
+        //qDebug() << "AutohideWidget::visiblePopups: internal_widget:" << internal_widget;
+        if (!internal_widget) return false;
+
+        // Check if any of the menus in the internal widget is visible
+        QObjectList children = internal_widget->children();
+        foreach(QObject * child, children) {
+                if (child->isWidgetType()) {
+                        //qDebug() << "AutohideWidget::visiblePopups:" << child << "child name:" << child->objectName();
+                        QWidget *w = static_cast<QWidget *>(child);
+
+                        QList<QAction *> actions = w->actions();
+                        foreach(QAction * action, actions) {
+                                //qDebug() << "AutohideWidget::visiblePopups: action:" << action;
+
+                                QList<QWidget *> aw = action->associatedWidgets();
+                                //qDebug() << "AutohideWidget::visiblePopups: aw:" << aw;
+
+                                QMenu * menu = 0;
+                                foreach(QWidget * widget, aw) {
+                                        //qDebug() << "AutohideWidget::visiblePopups: widget:" << widget;
+                                        if ((menu = qobject_cast<QMenu *>(widget))) {
+                                                //qDebug() << "AutohideWidget::visiblePopups: menu:" << menu << "visible:" << menu->isVisible();
+                                                if (menu->isVisible()) return true;
+                                        }
+                                }
+
+                                menu = action->menu();
+                                if (menu) {
+                                        //qDebug() << "AutohideWidget::visiblePopups: menu:" << menu << "visible:" << menu->isVisible();
+                                        if (menu->isVisible()) return true;
+                                }
+                        }
+                }
+        }
+        return false;
 }
 
@@ -123 +174 @@
         if (auto_hide) {
                 //qDebug("AutohideWidget::checkUnderMouse");
-                if ((isVisible()) && (!underMouse())) hide();
+                if (isVisible() && !underMouse() && !visiblePopups()) {
+                        hide();
+                }
         }
 }
@@ -141 +194 @@
         if (turned_on) {
                 //qDebug() << "AutohideWidget::eventFilter: obj:" << obj << "type:" << event->type();
+                #ifdef HANDLE_TAP_EVENT
+                if (event->type() == QEvent::Gesture) {
+                        qDebug() << "AutohideWidget::eventFilter: obj:" << obj << "gesture:" << event;
+                        QGestureEvent * gesture_event = static_cast<QGestureEvent*>(event);
+                        if (gesture_event->gesture(Qt::TapGesture)) {
+                                qDebug() << "AutohideWidget::eventFilter: tap event detected";
+                                if (!isVisible()) show(); //else hide();
+                                event->setAccepted(true);
+                                return true;
+                        } 
+                }
+                else
+                #endif
                 if (event->type() == QEvent::MouseMove) {
                         //qDebug() << "AutohideWidget::eventFilter: mouse move" << obj;
@@ -157 +223 @@
                         }
                 }
+                else
+                if (event->type() == QEvent::MouseButtonRelease && obj == this) {
+                        event->setAccepted(true);
+                        return true;
+                }
         }