|
22
by Philip Muškovac
* Merge with debian git, remainging changes: |
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(); |