AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cocoa: Fix combo box flicker on show.

Browse Source 
Replace Q_WS_MAC -> Q_OS_MAC, restore Qt 4 behavior
that does not disable updates on first show.

Change-Id: Ibc7f58add2a44c95879bd3c4772cea36dd7905fa
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
Morten Sorvig 2012-03-30 09:59:12 +02:00 committed by Qt by Nokia
parent 5211d17864
commit 4bafdc940b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/widgets/qcombobox.cpp
View File

@ -2468,7 +2468,7 @@ void QComboBox::showPopup()
}
container->setGeometry(listRect);
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
const bool updatesEnabled = container->updatesEnabled();
#endif
@ -2484,7 +2484,7 @@ void QComboBox::showPopup()
// If updates are disabled at this point we'll miss our chance at painting the popup
// menu before it's shown, causing flicker since the window then displays the standard gray
// background.
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
container->setUpdatesEnabled(false);
#endif
@ -2498,7 +2498,7 @@ void QComboBox::showPopup()
? QAbstractItemView::PositionAtCenter
: QAbstractItemView::EnsureVisible);
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
container->setUpdatesEnabled(updatesEnabled);
#endif