summaryrefslogtreecommitdiffstats
path: root/kcontrol/randr/krandrapp.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-06 19:44:37 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:26:36 +0200
commitfc260a60f60da219361a82a7ae871fdac55408d7 (patch)
treef854b854d526b19b381a05cf54a64a95673a81cc /kcontrol/randr/krandrapp.cpp
parent6dbf47b221d709244550b0177ddd18052670729d (diff)
downloadtdebase-fc260a60f60da219361a82a7ae871fdac55408d7.tar.gz
tdebase-fc260a60f60da219361a82a7ae871fdac55408d7.zip
Implement X11 event merging in krandrtray
This closes Bug 758 (cherry picked from commit f2ef0ca599f2e400b75c1f15bd379647a436bc54)
Diffstat (limited to 'kcontrol/randr/krandrapp.cpp')
-rw-r--r--kcontrol/randr/krandrapp.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/kcontrol/randr/krandrapp.cpp b/kcontrol/randr/krandrapp.cpp
index 2d773dd22..eab459e8e 100644
--- a/kcontrol/randr/krandrapp.cpp
+++ b/kcontrol/randr/krandrapp.cpp
@@ -28,13 +28,20 @@
KRandRApp::KRandRApp()
: m_tray(new KRandRSystemTray(0L, "RANDRTray"))
{
+ connect(&m_eventMergingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(handleX11ConfigChangeEvent()));
m_tray->show();
}
+void KRandRApp::handleX11ConfigChangeEvent()
+{
+ m_eventMergingTimer.stop();
+ m_tray->configChanged();
+}
+
bool KRandRApp::x11EventFilter(XEvent* e)
{
if (e->type == m_tray->screenChangeNotifyEvent()) {
- m_tray->configChanged();
+ m_eventMergingTimer.start(1000, TRUE);
}
return KApplication::x11EventFilter( e );
}