summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_p.h
diff options
context:
space:
mode:
authorFabien Freling <fabien.freling@nokia.com>2011-02-14 15:23:00 (GMT)
committerFabien Freling <fabien.freling@nokia.com>2011-02-15 12:49:38 (GMT)
commit78c5c1cae5f9e100bfb7388f68208406f0db4b42 (patch)
tree3dc89f26963c084ead61ec0ccefac9981e94866c /src/gui/kernel/qwidget_p.h
parent7da16ed9888133039c6d7a261fc7c4b61d9b6114 (diff)
downloadQt-78c5c1cae5f9e100bfb7388f68208406f0db4b42.zip
Qt-78c5c1cae5f9e100bfb7388f68208406f0db4b42.tar.gz
Qt-78c5c1cae5f9e100bfb7388f68208406f0db4b42.tar.bz2
Optimize the rendering path for the unified toolbar.
The over flushing of the toolbar had a huge performance impact so now we only flush the toolbar when necessary and moved the rendering out of the flushing process. Reviewed-by: Richard Moe Gustavsen
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
-rw-r--r--src/gui/kernel/qwidget_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 921cf03..59cb737 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -79,6 +79,7 @@
#ifdef Q_WS_MAC
#include <private/qt_mac_p.h>
+#include <private/qunifiedtoolbarsurface_mac_p.h>
#endif
#if defined(Q_WS_QWS)
@@ -855,8 +856,9 @@ public:
// Unified toolbar variables
bool isInUnifiedToolbar;
- QWindowSurface *unifiedSurface;
+ QUnifiedToolbarSurface *unifiedSurface;
QPoint toolbar_offset;
+ QWidget *toolbar_ancestor;
bool flushRequested;
#endif // QT_MAC_USE_COCOA
void determineWindowClass();