patches/qt3-0013-qiconview-rubber_on_move.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 782 a013313b88b4
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
782
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     1
--- qt-x11-free-3.3.8/src/iconview/qiconview.cpp.orig	2007-02-02 19:31:07.000000000 +0530
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     2
+++ qt-x11-free-3.3.8/src/iconview/qiconview.cpp	2008-01-08 21:10:14.443365125 +0530
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     3
@@ -236,6 +236,7 @@
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     4
     QPoint dragStartPos;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     5
     QFontMetrics *fm;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     6
     int minLeftBearing, minRightBearing;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     7
+    int rubberStartX, rubberStartY;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     8
 
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
     9
     uint mousePressed		:1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    10
     uint cleared		:1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    11
@@ -255,6 +256,7 @@
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    12
     uint firstSizeHint : 1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    13
     uint showTips		:1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    14
     uint pressedSelected	:1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    15
+    uint canStartRubber		:1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    16
     uint dragging		:1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    17
     uint drawActiveSelection	:1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    18
     uint inMenuMode		:1;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    19
@@ -2754,6 +2756,7 @@
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    20
     d->currentItem = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    21
     d->highlightedItem = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    22
     d->rubber = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    23
+    d->canStartRubber = FALSE;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    24
     d->scrollTimer = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    25
     d->startDragItem = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    26
     d->tmpCurrentItem = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    27
@@ -4513,29 +4516,19 @@
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    28
 
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    29
     setCurrentItem( item );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    30
 
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    31
+    d->canStartRubber = FALSE;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    32
     if ( e->button() == LeftButton ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    33
 	if ( !item && ( d->selectionMode == Multi ||
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    34
 				  d->selectionMode == Extended ) ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    35
-	    d->tmpCurrentItem = d->currentItem;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    36
-	    d->currentItem = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    37
-	    repaintItem( d->tmpCurrentItem );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    38
-	    if ( d->rubber )
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    39
-		delete d->rubber;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    40
-	    d->rubber = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    41
-	    d->rubber = new QRect( e->x(), e->y(), 0, 0 );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    42
-	    d->selectedItems.clear();
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    43
-	    if ( ( e->state() & ControlButton ) == ControlButton ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    44
-		for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() )
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    45
-		    if ( i->isSelected() )
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    46
-			d->selectedItems.insert( i, i );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    47
-	    }
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    48
+	    d->canStartRubber = TRUE;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    49
+	    d->rubberStartX = e->x();
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    50
+	    d->rubberStartY = e->y();
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    51
 	}
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    52
-
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    53
 	d->mousePressed = TRUE;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    54
     }
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    55
 
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    56
  emit_signals:
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    57
-    if ( !d->rubber ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    58
+    if ( !d->canStartRubber ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    59
 	emit mouseButtonPressed( e->button(), item, e->globalPos() );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    60
 	emit pressed( item );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    61
 	emit pressed( item, e->globalPos() );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    62
@@ -4579,6 +4572,7 @@
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    63
     d->mousePressed = FALSE;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    64
     d->startDragItem = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    65
 
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    66
+    d->canStartRubber = FALSE;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    67
     if ( d->rubber ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    68
 	QPainter p;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    69
 	p.begin( viewport() );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    70
@@ -4668,7 +4662,22 @@
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    71
 	    if ( d->tmpCurrentItem )
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    72
 		repaintItem( d->tmpCurrentItem );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    73
 	}
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    74
-    } else if ( d->mousePressed && !d->currentItem && d->rubber ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    75
+    } else if ( d->mousePressed && ((!d->currentItem && d->rubber) || d->canStartRubber) ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    76
+	if ( d->canStartRubber ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    77
+	    d->canStartRubber = FALSE;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    78
+	    d->tmpCurrentItem = d->currentItem;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    79
+	    d->currentItem = 0;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    80
+	    repaintItem( d->tmpCurrentItem );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    81
+	    delete d->rubber;
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    82
+	    d->rubber = new QRect( d->rubberStartX, d->rubberStartY, 0, 0 );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    83
+	    d->selectedItems.clear();
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    84
+	    if ( ( e->state() & ControlButton ) == ControlButton ||
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    85
+	         ( e->state() & ShiftButton ) == ShiftButton ) {
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    86
+		for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() )
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    87
+		    if ( i->isSelected() )
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    88
+			d->selectedItems.insert( i, i );
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    89
+	    }
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    90
+	}
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    91
 	doAutoScroll();
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    92
     }
a013313b88b4 QT3 Spec file and patches, initial revision.
moinakg
parents:
diff changeset
    93
 }