Changeset 786 for trunk/src/gui/kernel


Ignore:
Timestamp:
Oct 7, 2010, 3:04:40 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

gui: DnD: Fixed: Repainting the widget during DnD outside the drag*Event() callbacks would cause distortion under the mouse pointer in DIVE mode.

Location:
trunk/src/gui/kernel
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gui/kernel/qapplication_pm.cpp

    r785 r786  
    10841084                bool focus = SHORT1FROMMP(mp2);
    10851085                if (!focus) {
    1086                     if (!QWidget::find(hwnd) && !QDragManager::self()->object) {
     1086                    if (!QWidget::find(hwnd) && !QDragManager::self()->) {
    10871087                        // we gave up focus to another application, unset Qt
    1088                         // focus (exclude the situation when we start drag in
    1089                         // which case the PM focus goes to the drag bitmap while
    1090                         // the Qt focus should stay with our application)
     1088                        // focus (exclude the situation when we
     1089                        //
     1090                        // )
    10911091                        if (QApplication::activePopupWidget()) {
    10921092                            foreignFocusWnd = hwnd;
  • trunk/src/gui/kernel/qdnd_p.h

    r651 r786  
    267267    QWidget *currentTarget();
    268268
     269
     270
    269271#ifdef Q_WS_X11
    270272    QPixmap xdndMimeTransferedPixmap[2];
     
    287289#endif
    288290#ifdef Q_OS_SYMBIAN
    289 #ifndef QT_NO_CURSOR 
     291#ifndef QT_NO_CURSOR
    290292    QCursor overrideCursor;
    291293#endif
  • trunk/src/gui/kernel/qwidget.cpp

    r769 r786  
    1105711057        return (HPS) d->hd;
    1105811058#ifndef QT_NO_DRAGANDDROP
    11059     if (QDragManager::self()->isInDrag())
     11059    if (QDragManager::self()->isInDrag() ||
     11060        QDragManager::self()->isInOwnDrag())
    1106011061        return DrgGetPS(winId());
    1106111062#endif
     
    1107611077    if (d->hd == NULLHANDLE) {
    1107711078#ifndef QT_NO_DRAGANDDROP
    11078         if (QDragManager::self()->isInDrag())
     11079        if (QDragManager::self()->isInDrag() ||
     11080            QDragManager::self()->isInOwnDrag())
    1107911081            DrgReleasePS(hps);
    1108011082        else
Note: See TracChangeset for help on using the changeset viewer.