diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2009-05-20 10:45:11 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jbache@trolltech.com> | 2009-05-20 10:48:13 (GMT) |
| commit | b7e01ff7d994d704cbcd876a77bf32cbdf66c17b (patch) | |
| tree | 04eb4fa15c5968bad4897c4502039d81ca3406fb | |
| parent | b28e95cd2fbdd0f8ad5030e6fc3beede057548da (diff) | |
| download | Qt-b7e01ff7d994d704cbcd876a77bf32cbdf66c17b.zip Qt-b7e01ff7d994d704cbcd876a77bf32cbdf66c17b.tar.gz Qt-b7e01ff7d994d704cbcd876a77bf32cbdf66c17b.tar.bz2 | |
Revert focus apparance on itemviews for X11
We changed this primarily for the mac as active appearance on
widgets in itemviews should depend on the window activation state and
not on the focus widget. It was explicitly added back for windows only
but has been reported as a bug on X11 as well so we might as well keep
it mac-only for now.
Reviewed-by: mortens
| -rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 7a3d674..c77395a 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -3220,9 +3220,9 @@ QStyleOptionViewItem QAbstractItemView::viewOptions() const option.state &= ~QStyle::State_MouseOver; option.font = font(); -#ifdef Q_WS_WIN - // Note this is currently required on Windows - // do give non-focused item views inactive appearance +#ifndef Q_WS_MAC + // On mac the focus appearance follows window activation + // not widget activation if (!hasFocus()) option.state &= ~QStyle::State_Active; #endif |