← Back to branch summary

~ubuntu-branches/ubuntu/lucid/qt-x11-free/lucid

« back to all changes in this revision

Viewing changes to debian/patches/0001-dnd_optimization.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2009-11-09 14:37:51 UTC
  • mfrom: (0.32.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091109143751-ocohpw4y0j4yi20w
Tags: 3:3.3.8-b-6ubuntu1
https://launchpad.net/bugs/209227
* Merge with Debian, remaining changes:
 - Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen.
   Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686
 - Add kubuntu_09_flickerfree_qiconview.dpatch to add
   double-buffering for the icon redraw - prevents flicker on window
   redrawing (LP: #209227)
 - No firebird/ibase build (remove build-dep, control entry, ibase
   ./configure option), firebird is not in Ubuntu main
 - Add debian/qt_plugins_3.3rc and debian/qtrc to set default style to plastique, edit libqt3-mt.install to install them

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-dnd_optimization.diff
26
26
 #undef KeyPress
27
27
 #undef KeyRelease
28
28
 
29
 
@@ -256,20 +258,47 @@
 
29
@@ -256,20 +258,47 @@ class QShapedPixmapWidget : public QWidg
30
30
 public:
31
31
     QShapedPixmapWidget(int screen = -1) :
32
32
        QWidget(QApplication::desktop()->screen( screen ),
77
77
 };
78
78
 
79
79
 static QShapedPixmapWidget * qt_xdnd_deco = 0;
80
 
@@ -875,6 +904,45 @@
 
80
@@ -875,6 +904,45 @@ void QDragManager::timerEvent( QTimerEve
81
81
        move( QCursor::pos() );
82
82
 }
83
83
 
123
123
 bool QDragManager::eventFilter( QObject * o, QEvent * e)
124
124
 {
125
125
     if ( beingCancelled ) {
126
 
@@ -897,8 +965,10 @@
 
126
@@ -897,8 +965,10 @@ bool QDragManager::eventFilter( QObject 
127
127
 
128
128
     if ( e->type() == QEvent::MouseMove ) {
129
129
        QMouseEvent* me = (QMouseEvent *)e;
136
136
        return TRUE;
137
137
     } else if ( e->type() == QEvent::MouseButtonRelease ) {
138
138
        qApp->removeEventFilter( this );
139
 
@@ -1139,7 +1209,7 @@
 
139
@@ -1139,7 +1209,7 @@ void QDragManager::move( const QPoint & 
140
140
            qt_xdnd_deco->grabMouse();
141
141
        }
142
142
     }
145
145
 
146
146
     if ( qt_xdnd_source_sameanswer.contains( globalPos ) &&
147
147
         qt_xdnd_source_sameanswer.isValid() ) {
148
 
@@ -1732,7 +1802,7 @@
 
148
@@ -1732,7 +1802,7 @@ bool QDragManager::drag( QDragObject * o
149
149
     // qt_xdnd_source_object persists until we get an xdnd_finish message
150
150
 }
151
151
 
154
154
 {
155
155
     if ( qt_xdnd_deco ) {
156
156
        QPixmap pm;
157
 
@@ -1747,9 +1817,8 @@
 
157
@@ -1747,9 +1817,8 @@ void QDragManager::updatePixmap()
158
158
                defaultPm = new QPixmap(default_pm);
159
159
            pm = *defaultPm;
160
160
        }
166
166
            //if ( willDrop ) {
167
167
            qt_xdnd_deco->show();
168
168
            //} else {
169
 
@@ -1758,4 +1827,9 @@
 
169
@@ -1758,4 +1827,9 @@ void QDragManager::updatePixmap()
170
170
     }
171
171
 }
172
172
 
178
178
 #endif // QT_NO_DRAGANDDROP
179
179
--- a/src/kernel/qdragobject.h
180
180
+++ b/src/kernel/qdragobject.h
181
 
@@ -248,6 +248,7 @@
 
181
@@ -248,6 +248,7 @@ private:
182
182
     void move( const QPoint & );
183
183
     void drop();
184
184
     void updatePixmap();