diff options
author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-10-27 13:32:05 (GMT) |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-10-27 13:32:05 (GMT) |
commit | a4b77f3887a4eb0f3ce103d2457f57e94938d771 (patch) | |
tree | 424cb6a1f8f879796386d960816a9d660028206f /src/gui/kernel | |
parent | 138962d1c25a9cbb4375aa09bdeb7901c6536ce1 (diff) | |
download | Qt-a4b77f3887a4eb0f3ce103d2457f57e94938d771.zip Qt-a4b77f3887a4eb0f3ce103d2457f57e94938d771.tar.gz Qt-a4b77f3887a4eb0f3ce103d2457f57e94938d771.tar.bz2 |
Fix the combobox popup 1-second fadeout regression on Carbon.
Regression caused by b946da648af0c5fa1c73fe1e57b0b1e08fb14d13.
Prior to that commit, the default duration for macWindowFade was 0, but there
was code in the implementation that set it to 0.15 in that case.
Set the default duration to 0.15. This matches the old behavior when calling
macWindowFade without specifying a duration, and makes it clearer what the
default really is.
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index 62db064..5318d31 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -116,7 +116,7 @@ typedef struct CGPoint NSPoint; QT_BEGIN_NAMESPACE Qt::MouseButtons qt_mac_get_buttons(int buttons); Qt::MouseButton qt_mac_get_button(EventMouseButton button); -void macWindowFade(void * /*OSWindowRef*/ window, float durationSeconds = 0); +void macWindowFade(void * /*OSWindowRef*/ window, float durationSeconds = 0.15); bool macWindowIsTextured(void * /*OSWindowRef*/ window); void macWindowToolbarShow(const QWidget *widget, bool show ); void macWindowToolbarSet( void * /*OSWindowRef*/ window, void* toolbarRef ); |