Changeset 182

Timestamp:

Sep 15, 2009, 3:21:22 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented standard cursor shapes (#54).

Location:

trunk/src/gui/kernel

Files:

• qapplication.cpp (modified) (2 diffs)
• qapplication_pm.cpp (modified) (1 diff)
• qcursor_pm.cpp (modified) (1 diff)
• qwidget_pm.cpp (modified) (1 diff)

trunk/src/gui/kernel/qapplication.cpp

@@ -2506 +2506 @@
 #if defined(Q_WS_WIN)
   extern void qt_win_set_cursor(QWidget *, bool);
+
+
 #elif defined(Q_WS_X11)
   extern void qt_x11_enforce_cursor(QWidget *, bool);
@@ -2657 +2659 @@
 #if defined(Q_WS_WIN)
             qt_win_set_cursor(cursorWidget, true);
+
+
 #elif defined(Q_WS_X11)
             qt_x11_enforce_cursor(cursorWidget, true);

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -423 +423 @@
 void QApplication::setOverrideCursor(const QCursor &cursor)
 {
-    // @todo implement
+    qApp->d_func()->cursor_list.prepend(cursor);
+    WinSetPointer(HWND_DESKTOP, qApp->d_func()->cursor_list.first().handle());
 }
 
 void QApplication::restoreOverrideCursor()
 {
-    // @todo implement
-}
-
-#endif
+    if (qApp->d_func()->cursor_list.isEmpty())
+        return;
+    qApp->d_func()->cursor_list.removeFirst();
+
+    if (!qApp->d_func()->cursor_list.isEmpty()) {
+        WinSetPointer(HWND_DESKTOP, qApp->d_func()->cursor_list.first().handle());
+    } else {
+        QWidget *w = QWidget::find(curWin);
+        if (w)
+            WinSetPointer(HWND_DESKTOP, w->cursor().handle());
+        else
+            WinSetPointer(HWND_DESKTOP, QCursor(Qt::ArrowCursor).handle());
+    }
+}
+
+/*
+  Internal function called from QWidget::setCursor()
+   force is true if this function is called from dispatchEnterLeave, it means that the
+   mouse is actually directly under this widget.
+*/
+void qt_pm_set_cursor(QWidget *w, bool force)
+{
+    static QPointer<QWidget> lastUnderMouse = 0;
+    if (force) {
+        lastUnderMouse = w;
+    } else if (w->testAttribute(Qt::WA_WState_Created) && lastUnderMouse
+               && lastUnderMouse->effectiveWinId() == w->effectiveWinId()) {
+        w = lastUnderMouse;
+    }
+
+    if (!curWin && w && w->internalWinId())
+        return;
+    QWidget* cW = w && !w->internalWinId() ? w : QWidget::find(curWin);
+    if (!cW || cW->window() != w->window() ||
+         !cW->isVisible() || !cW->underMouse() || QApplication::overrideCursor())
+        return;
+
+    WinSetPointer(HWND_DESKTOP, cW->cursor().handle());
+}
+
+#endif // QT_NO_CURSOR
 
 /*****************************************************************************

trunk/src/gui/kernel/qcursor_pm.cpp

@@ -136 +136 @@
         QCursorData::initialize();
     // @todo we depend on QPixmap vs HBITMAP integration here
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -1402 +1402 @@
 
 #ifndef QT_NO_CURSOR
+
+
+
 void QWidgetPrivate::setCursor_sys(const QCursor &cursor)
 {
-    // @todo implement, depends on #29
+    Q_UNUSED(cursor);
+    Q_Q(QWidget);
+    qt_pm_set_cursor(q, false);
 }
 
 void QWidgetPrivate::unsetCursor_sys()
 {
-    // @todo implement, depends on #29
+    Q_Q(QWidget);
+    qt_pm_set_cursor(q, false);
 }
 #endif