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

Merge branch 'KDE/4.9'

Browse source
This commit is contained in:
Martin Gräßlin 2012-07-14 11:17:38 +02:00
commit 9f8a7b1af0
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -427,6 +427,16 @@ int AuroraeClient::doubleClickInterval() const
return QApplication::doubleClickInterval(); return QApplication::doubleClickInterval();
} }
void AuroraeClient::closeWindow()
{
QMetaObject::invokeMethod(qobject_cast< KDecorationUnstable* >(this), "doCloseWindow", Qt::QueuedConnection);
}
void AuroraeClient::doCloseWindow()
{
KDecorationUnstable::closeWindow();
}
} // namespace Aurorae } // namespace Aurorae
extern "C" extern "C"

2
clients/aurorae/src/aurorae.h
View file

@ -143,9 +143,11 @@ public slots:
void titlePressed(Qt::MouseButton button, Qt::MouseButtons buttons); void titlePressed(Qt::MouseButton button, Qt::MouseButtons buttons);
void titleReleased(Qt::MouseButton button, Qt::MouseButtons buttons); void titleReleased(Qt::MouseButton button, Qt::MouseButtons buttons);
void titleMouseMoved(Qt::MouseButton button, Qt::MouseButtons buttons); void titleMouseMoved(Qt::MouseButton button, Qt::MouseButtons buttons);
void closeWindow();
private slots: private slots:
void themeChanged(); void themeChanged();
void doCloseWindow();
private: private:
QGraphicsView *m_view; QGraphicsView *m_view;

2
useractions.cpp
View file

@ -701,7 +701,7 @@ void Workspace::performWindowOperation(Client* c, Options::WindowOperation op)
c->performMouseCommand(Options::MouseUnrestrictedResize, cursorPos()); c->performMouseCommand(Options::MouseUnrestrictedResize, cursorPos());
break; break;
case Options::CloseOp: case Options::CloseOp:
c->closeWindow(); QMetaObject::invokeMethod(c, "closeWindow", Qt::QueuedConnection);
break; break;
case Options::MaximizeOp: case Options::MaximizeOp:
c->maximize(c->maximizeMode() == Client::MaximizeFull c->maximize(c->maximizeMode() == Client::MaximizeFull