summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qsoftkeymanager_p.h
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-09-20 12:28:47 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-09-21 08:07:53 (GMT)
commit96f0746298a1b93d0d22e3678a17e2a58d4010c7 (patch)
tree98c3435aa24e2091e687ab523aae6e5ceab8e539 /src/gui/kernel/qsoftkeymanager_p.h
parent7bb16c92a29d316b0dc385e95d99d3edfd1b4196 (diff)
downloadQt-96f0746298a1b93d0d22e3678a17e2a58d4010c7.zip
Qt-96f0746298a1b93d0d22e3678a17e2a58d4010c7.tar.gz
Qt-96f0746298a1b93d0d22e3678a17e2a58d4010c7.tar.bz2
Add a new compressable event QEvent::UpdateSoftKeys.
Now that the softkey framework triggers updates on focus changed, window activated, and action added/removed/changed the softkey bar was updating many times resulting in flicker. Solve that by introducing a new event type that is posted to the softkey framework. Since we only need to update the softkeys once per event loop iteration, the event is compressible in the event loop. Reviewed-by: Alessandro Portale
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_p.h')
-rw-r--r--src/gui/kernel/qsoftkeymanager_p.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_p.h b/src/gui/kernel/qsoftkeymanager_p.h
index 743b4d4..229df98 100644
--- a/src/gui/kernel/qsoftkeymanager_p.h
+++ b/src/gui/kernel/qsoftkeymanager_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QSoftKeyManager : public QObject
+class Q_AUTOTEST_EXPORT QSoftKeyManager : public QObject
{
Q_OBJECT
@@ -73,7 +73,7 @@ public:
CancelSoftKey,
};
- static void updateSoftKeys(bool force = false);
+ static void updateSoftKeys();
static QAction *createAction(StandardSoftKey standardKey, QWidget *actionWidget);
static QAction *createKeyedAction(StandardSoftKey standardKey, Qt::Key key, QWidget *actionWidget);
@@ -91,6 +91,9 @@ private:
static QWidget *softKeySource;
QHash<QAction*, Qt::Key> keyedActions;
+protected:
+ bool event(QEvent *e);
+
Q_DISABLE_COPY(QSoftKeyManager)
private Q_SLOTS: