chore(player): control bar hidden behavior

ffiirree · Mar 25, 2024 · 08c4498 · 08c4498
1 parent 4fa1610
commit 08c4498
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/player/control-widget.cpp b/src/player/control-widget.cpp
@@ -134,7 +134,8 @@ ControlWidget::ControlWidget(FramelessWindow *parent)
 bool ControlWidget::hideable() const
 {
     const auto pos = mapFromGlobal(QCursor::pos());
-    return !title_bar_->geometry().contains(pos) && !control_bar_->geometry().contains(pos) &&
+    return !(title_bar_->geometry() + QMargins{ 0, 0, 0, 25 }).contains(pos) &&
+           !(control_bar_->geometry() + QMargins{ 0, 25, 0, 0 }).contains(pos) &&
            !speed_box_->view()->isVisible();
 }
 

diff --git a/src/player/video-player.cpp b/src/player/video-player.cpp
@@ -43,6 +43,7 @@ VideoPlayer::VideoPlayer(QWidget *parent)
 
     // control bar
     control_ = new ControlWidget(this);
+
     // clang-format off
     connect(control_,   &ControlWidget::pause,          this, &VideoPlayer::pause);
     connect(control_,   &ControlWidget::resume,         this, &VideoPlayer::resume);
@@ -70,11 +71,11 @@ VideoPlayer::VideoPlayer(QWidget *parent)
 
     timer_ = new QTimer(this);
     timer_->setSingleShot(true);
-    timer_->start(2500ms);
+    timer_->start(2000ms);
     connect(timer_, &QTimer::timeout, [this] {
-        if (control_->isVisible() && control_->hideable()) {
+        if (control_->hideable()) {
             setCursor(Qt::BlankCursor);
-            control_->hide();
+            if (control_->isVisible()) control_->hide();
         }
     });
 
@@ -421,12 +422,13 @@ void VideoPlayer::setVolume(const int volume) { control_->setVolume(std::clamp<i
 bool VideoPlayer::event(QEvent *event)
 {
     if (event->type() == QEvent::HoverMove) {
-        timer_->start(2500ms);
+        timer_->start(2000ms);
 
-        if (control_ && !control_->isVisible()) {
-            setCursor(Qt::ArrowCursor);
-            control_->show();
-        }
+        setCursor(Qt::ArrowCursor);
+        if (!control_->isVisible() && !control_->hideable()) control_->show();
+    }
+    else if (event->type() == QEvent::Show) {
+        control_->hide();
     }
 
     return FramelessWindow::event(event);

diff --git a/src/widgets/framelesswindow.cpp b/src/widgets/framelesswindow.cpp
@@ -274,7 +274,9 @@ bool FramelessWindow::nativeEvent(const QByteArray& eventType, void *message, Q_
             }
         }
 
-        if (IsFullscreen(hwnd) || IsMaximized(hwnd) || isSizeFixed()) {
+        const auto fullscreen = IsFullscreen(hwnd);
+
+        if (fullscreen || IsMaximized(hwnd) || isSizeFixed()) {
             switch (res) {
             case HTTOP:
             case HTRIGHT:
@@ -288,7 +290,7 @@ bool FramelessWindow::nativeEvent(const QByteArray& eventType, void *message, Q_
             }
         }
 
-        if (res == HTCLIENT && titlebar_ && titlebar_->isVisible()) {
+        if (!fullscreen && res == HTCLIENT && titlebar_ && titlebar_->isVisible()) {
             if (const auto pos = mapFromGlobal(QPoint{ GET_X_LPARAM(wmsg->lParam), GET_Y_LPARAM(wmsg->lParam) });
                 titlebar_->geometry().contains(pos) && !titlebar_->isInSystemButtons(pos)) {
                 *result = HTCAPTION;