← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde-baseapps/quantal

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_folderwidget_drawing.diff

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-05-25 17:26:17 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20120525172617-xr9bzhlugldbflvq
Tags: 4:4.8.80a-0ubuntu1
* Merge with debian git, remainging changes:
  - keep breaks/replaces
  - keep symbol files
  - keep kubuntu patches
  - dolphin suggests and not recommends ruby
  - add kfind, konsole and kompare to dolphin suggests
* konq-plugins breaks/replaces kde-baseapps-data << 4:4.8.80

* Drop squence numbers from kubuntu patches 

* New upstream beta release
  - refresh kubuntu_fix_systemsettings_about_me.diff
  - add new doc images to {konqueror,dolphin}.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_folderwidget_drawing.diff
 
1
Index: kde-baseapps-4.8.0/plasma/applets/folderview/iconview.cpp
 
2
===================================================================
 
3
--- kde-baseapps-4.8.0.orig/plasma/applets/folderview/iconview.cpp      2011-09-26 10:43:17.000000000 +0100
 
4
+++ kde-baseapps-4.8.0/plasma/applets/folderview/iconview.cpp   2012-02-21 13:38:15.359096668 +0000
 
5
@@ -2430,22 +2430,16 @@
 
6
     pixmap.fill(Qt::transparent);
 
7
 
 
8
     QStyleOptionViewItemV4 option = viewOptions();
 
9
-    // ### We can't draw the items as selected or hovered since Qt doesn't
 
10
-    //     use an ARGB window for the drag pixmap.
 
11
-    //option.state |= QStyle::State_Selected;
 
12
-    option.state &= ~(QStyle::State_Selected | QStyle::State_MouseOver);
 
13
+    option.state |= QStyle::State_Selected;
 
14
 
 
15
     QPainter p(&pixmap);
 
16
     foreach (const QModelIndex &index, indexes)
 
17
     {
 
18
         option.rect = visualRect(index).translated(-boundingRect.topLeft());
 
19
-#if 0
 
20
-        // ### Reenable this code when Qt uses an ARGB window for the drag pixmap
 
21
         if (index == m_hoveredIndex)
 
22
             option.state |= QStyle::State_MouseOver;
 
23
         else
 
24
             option.state &= ~QStyle::State_MouseOver;
 
25
-#endif
 
26
         paintItem(&p, option, index);
 
27
     }
 
28
     p.end();