yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

queue aurorae decoration button events to prevent them from

Browse source 
destroying the scene in the same event cycle

BUG: 242116
REVIEW: 103336
This commit is contained in:
Thomas Lübking 2011-12-05 15:29:26 +01:00
parent 8426e13f3a
commit 4040b1ae2f
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clients/aurorae/src/aurorae.cpp
View file

@ -40,6 +40,8 @@ AuroraeFactory::AuroraeFactory()
void AuroraeFactory::init() void AuroraeFactory::init()
{ {
qRegisterMetaType<uint>("Qt::MouseButtons");
KConfig conf("auroraerc"); KConfig conf("auroraerc");
KConfigGroup group(&conf, "Engine"); KConfigGroup group(&conf, "Engine");
@ -137,16 +139,16 @@ AuroraeClient::AuroraeClient(KDecorationBridge *bridge, KDecorationFactory *fact
options()->customButtonPositions() ? options()->titleButtonsLeft() : AuroraeFactory::instance()->theme()->defaultButtonsLeft(), options()->customButtonPositions() ? options()->titleButtonsLeft() : AuroraeFactory::instance()->theme()->defaultButtonsLeft(),
options()->customButtonPositions() ? options()->titleButtonsRight() : AuroraeFactory::instance()->theme()->defaultButtonsRight(), options()->customButtonPositions() ? options()->titleButtonsRight() : AuroraeFactory::instance()->theme()->defaultButtonsRight(),
providesContextHelp(), NULL); providesContextHelp(), NULL);
connect(m_scene, SIGNAL(closeWindow()), SLOT(closeWindow())); connect(m_scene, SIGNAL(closeWindow()), SLOT(closeWindow()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(maximize(Qt::MouseButtons)), SLOT(maximize(Qt::MouseButtons))); connect(m_scene, SIGNAL(maximize(Qt::MouseButtons)), SLOT(maximize(Qt::MouseButtons)), Qt::QueuedConnection);
connect(m_scene, SIGNAL(showContextHelp()), SLOT(showContextHelp())); connect(m_scene, SIGNAL(showContextHelp()), SLOT(showContextHelp()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(minimizeWindow()), SLOT(minimize())); connect(m_scene, SIGNAL(minimizeWindow()), SLOT(minimize()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(menuClicked()), SLOT(menuClicked())); connect(m_scene, SIGNAL(menuClicked()), SLOT(menuClicked()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(menuDblClicked()), SLOT(closeWindow())); connect(m_scene, SIGNAL(menuDblClicked()), SLOT(closeWindow()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(toggleOnAllDesktops()), SLOT(toggleOnAllDesktops())); connect(m_scene, SIGNAL(toggleOnAllDesktops()), SLOT(toggleOnAllDesktops()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(toggleShade()), SLOT(toggleShade())); connect(m_scene, SIGNAL(toggleShade()), SLOT(toggleShade()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(toggleKeepAbove()), SLOT(toggleKeepAbove())); connect(m_scene, SIGNAL(toggleKeepAbove()), SLOT(toggleKeepAbove()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(toggleKeepBelow()), SLOT(toggleKeepBelow())); connect(m_scene, SIGNAL(toggleKeepBelow()), SLOT(toggleKeepBelow()), Qt::QueuedConnection);
connect(m_scene, SIGNAL(titlePressed(Qt::MouseButton,Qt::MouseButtons)), connect(m_scene, SIGNAL(titlePressed(Qt::MouseButton,Qt::MouseButtons)),
SLOT(titlePressed(Qt::MouseButton,Qt::MouseButtons))); SLOT(titlePressed(Qt::MouseButton,Qt::MouseButtons)));
connect(m_scene, SIGNAL(titleReleased(Qt::MouseButton,Qt::MouseButtons)), connect(m_scene, SIGNAL(titleReleased(Qt::MouseButton,Qt::MouseButtons)),