v3.1.8

Refactored drag logic in LaunchyWidget to track both local and global drag start positions, improving accuracy when moving the widget between screens. Added debug logging for mouse events and screen geometry, and updated logic to reload the skin only when the widget is moved to a different screen. Also incremented the patch version to 3.1.8.

Author: samsonwang

src/Launchy/LaunchyVersion.h

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define LAUNCHY_VERSION_MAJOR 3
 #define LAUNCHY_VERSION_MINOR 1
-#define LAUNCHY_VERSION_PATCH 7
+#define LAUNCHY_VERSION_PATCH 8
 
 // auto generate version number and string below
 constexpr unsigned LAUNCHY_VERSION

src/Launchy/LaunchyWidget.cpp

@@ -1308,65 +1308,82 @@ void LaunchyWidget::applySkin(const QString& name) {
     InputDataList::setSeparator(m_inputBox->separatorText());
 }
 
-void LaunchyWidget::mousePressEvent(QMouseEvent *event) {
-    if (event->buttons() == Qt::LeftButton) {
-        if (!g_settings->value(OPTION_DRAGMODE, OPTION_DRAGMODE_DEFAULT).toBool()
-            || (event->modifiers() & Qt::ShiftModifier)) {
-            m_dragging = true;
-            m_dragStartPoint = event->pos();
-        }
+void LaunchyWidget::mousePressEvent(QMouseEvent* event) {
+
+    if (event->buttons() == Qt::LeftButton
+        && (!g_settings->value(OPTION_DRAGMODE, OPTION_DRAGMODE_DEFAULT).toBool()
+            || (event->modifiers() & Qt::ShiftModifier))) {
+
+        m_dragging = true;
+        m_dragStartPos = event->pos();
+        m_dragStartGlobalPos = event->globalPos();
+
+        qDebug() << "LaunchyWidget::mousePressEvent, drag begin, global pos:"
+            << m_dragStartGlobalPos << "pos:" << m_dragStartPos;
     }
+
     hideAlternativeList();
     activateWindow();
     m_inputBox->setFocus();
 }
 
 void LaunchyWidget::mouseMoveEvent(QMouseEvent* event) {
-    if (event->buttons() == Qt::LeftButton
-        && m_dragging) {
+    if (m_dragging && event->buttons() == Qt::LeftButton) {
 
         hideAlternativeList();
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-        QPoint pt = event->globalPos() - m_dragStartPoint;
+        QPoint pt = event->globalPos() - m_dragStartPos;
 #else
-        QPoint pt = event->globalPosition().toPoint() - m_dragStartPoint;
+        QPoint pt = event->globalPosition().toPoint() - m_dragStartPos;
 #endif
 
         move(pt);
 
-        // qDebug() << "LaunchyWidget::mouseMoveEvent, pos:" << pt;
-
         m_inputBox->setFocus();
     }
 }
 
 void LaunchyWidget::mouseReleaseEvent(QMouseEvent* event) {
+    if (m_dragging == false) {
+        return;
+    }
 
     m_dragging = false;
 
-    hideAlternativeList();
-    m_inputBox->setFocus();
-
-    int screenIndex = g_settings->value(OPTION_SCREEN_INDEX, OPTION_SCREEN_INDEX_DEFAULT).toInt();
-
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QPoint pt = event->globalPos();
 #else
     QPoint pt = event->globalPosition().toPoint();
 #endif
 
+    qDebug() << "LaunchyWidget::mouseReleaseEvent, drag end, global pos:" << pt;
+
+    hideAlternativeList();
+    m_inputBox->setFocus();
+
+    int prevScreenIndex = -1;
+    int currScreenIndex = -1;
+
     QList<QScreen*> listScreens = qApp->screens();
     for (int i = 0; i < listScreens.size(); ++i) {
-        QScreen* pScreen = listScreens.at(i);
+        QScreen* screen = listScreens.at(i);
 
-        if (pScreen->geometry().contains(pt)) {
-            // skip when cursor screen is enabled
-            if (screenIndex != -1) {
-                g_settings->setValue(OPTION_SCREEN_INDEX, i);
-            }
+        qDebug() << "LaunchyWidget::mouseReleaseEvent, screen:" << i
+            << " geometry:" << screen->geometry();
+
+        if (prevScreenIndex == -1 && screen->geometry().contains(m_dragStartGlobalPos)) {
+            prevScreenIndex = i;
+        }
 
-            if (screenIndex != i) {
+        if (currScreenIndex == -1 && screen->geometry().contains(pt)) {
+            currScreenIndex = i;
+        }
+
+        if (prevScreenIndex >= 0 && currScreenIndex >= 0) {
+            qDebug() << "LaunchyWidget::mouseReleaseEvent, prev screen:" << prevScreenIndex
+                << "curr screen:" << currScreenIndex;
+            if (prevScreenIndex != currScreenIndex) {
                 reloadSkin();
             }
             break;
@@ -1375,6 +1392,9 @@ void LaunchyWidget::mouseReleaseEvent(QMouseEvent* event) {
 }
 
 void LaunchyWidget::contextMenuEvent(QContextMenuEvent* event) {
+    qDebug() << "LaunchyWidget::contextMenuEvent, global pos:"
+        << event->globalPos() << "pos:" << event->pos();
+
     QMenu menu(this);
     menu.addAction(m_actRebuild);
     menu.addAction(m_actReloadSkin);

src/Launchy/LaunchyWidget.h

@@ -182,7 +182,8 @@ protected slots:
     bool m_alwaysShowLaunchy;
 
     bool m_dragging;
-    QPoint m_dragStartPoint;
+    QPoint m_dragStartPos;
+    QPoint m_dragStartGlobalPos;
     bool m_menuOpen;
 
     OptionDialog* m_optionDialog;