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

Move clientMaximizedStateChanged signal from Client to AbstractClient

Browse source
This commit is contained in:
Martin Gräßlin 2015-06-07 03:17:34 +02:00
parent 239104b4f4
commit 034276af36
7 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
abstract_client.h
View file

@ -372,6 +372,8 @@ Q_SIGNALS:
void clientUnminimized(KWin::AbstractClient* client, bool animate); void clientUnminimized(KWin::AbstractClient* client, bool animate);
void paletteChanged(const QPalette &p); void paletteChanged(const QPalette &p);
void captionChanged(); void captionChanged();
void clientMaximizedStateChanged(KWin::AbstractClient*, MaximizeMode);
void clientMaximizedStateChanged(KWin::AbstractClient* c, bool h, bool v);
protected: protected:
AbstractClient(); AbstractClient();

2
client.cpp
View file

@ -171,7 +171,7 @@ Client::Client()
ready_for_painting = false; // wait for first damage or sync reply ready_for_painting = false; // wait for first damage or sync reply
connect(this, &Client::geometryShapeChanged, this, &Client::geometryChanged); connect(this, &Client::geometryShapeChanged, this, &Client::geometryChanged);
auto signalMaximizeChanged = static_cast<void (Client::*)(KWin::Client*, MaximizeMode)>(&Client::clientMaximizedStateChanged); auto signalMaximizeChanged = static_cast<void (Client::*)(KWin::AbstractClient*, MaximizeMode)>(&Client::clientMaximizedStateChanged);
connect(this, signalMaximizeChanged, this, &Client::geometryChanged); connect(this, signalMaximizeChanged, this, &Client::geometryChanged);
connect(this, &Client::clientStepUserMovedResized, this, &Client::geometryChanged); connect(this, &Client::clientStepUserMovedResized, this, &Client::geometryChanged);
connect(this, &Client::clientStartUserMovedResized, this, &Client::moveResizedChanged); connect(this, &Client::clientStartUserMovedResized, this, &Client::moveResizedChanged);

2
client.h
View file

@ -559,8 +559,6 @@ private Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void clientManaging(KWin::Client*); void clientManaging(KWin::Client*);
void clientFullScreenSet(KWin::Client*, bool, bool); void clientFullScreenSet(KWin::Client*, bool, bool);
void clientMaximizedStateChanged(KWin::Client*, MaximizeMode);
void clientMaximizedStateChanged(KWin::Client* c, bool h, bool v);
void clientStartUserMovedResized(KWin::Client*); void clientStartUserMovedResized(KWin::Client*);
void clientStepUserMovedResized(KWin::Client *, const QRect&); void clientStepUserMovedResized(KWin::Client *, const QRect&);
void clientFinishUserMovedResized(KWin::Client*); void clientFinishUserMovedResized(KWin::Client*);

4
effects.cpp
View file

@ -339,7 +339,7 @@ EffectsHandlerImpl::~EffectsHandlerImpl()
void EffectsHandlerImpl::setupClientConnections(Client* c) void EffectsHandlerImpl::setupClientConnections(Client* c)
{ {
connect(c, &Client::windowClosed, this, &EffectsHandlerImpl::slotWindowClosed); connect(c, &Client::windowClosed, this, &EffectsHandlerImpl::slotWindowClosed);
connect(c, static_cast<void (Client::*)(KWin::Client*, MaximizeMode)>(&Client::clientMaximizedStateChanged), connect(c, static_cast<void (Client::*)(KWin::AbstractClient*, MaximizeMode)>(&Client::clientMaximizedStateChanged),
this, &EffectsHandlerImpl::slotClientMaximized); this, &EffectsHandlerImpl::slotClientMaximized);
connect(c, &Client::clientStartUserMovedResized, this, connect(c, &Client::clientStartUserMovedResized, this,
[this](Client *c) { [this](Client *c) {
@ -540,7 +540,7 @@ void EffectsHandlerImpl::startPaint()
m_currentPaintEffectFrameIterator = m_activeEffects.constBegin(); m_currentPaintEffectFrameIterator = m_activeEffects.constBegin();
} }
void EffectsHandlerImpl::slotClientMaximized(KWin::Client *c, MaximizeMode maxMode) void EffectsHandlerImpl::slotClientMaximized(KWin::AbstractClient *c, MaximizeMode maxMode)
{ {
bool horizontal = false; bool horizontal = false;
bool vertical = false; bool vertical = false;

2
effects.h
View file

@ -237,7 +237,7 @@ protected Q_SLOTS:
void slotShellClientShown(KWin::Toplevel*); void slotShellClientShown(KWin::Toplevel*);
void slotUnmanagedShown(KWin::Toplevel*); void slotUnmanagedShown(KWin::Toplevel*);
void slotWindowClosed(KWin::Toplevel *c); void slotWindowClosed(KWin::Toplevel *c);
void slotClientMaximized(KWin::Client *c, MaximizeMode maxMode); void slotClientMaximized(KWin::AbstractClient *c, MaximizeMode maxMode);
void slotOpacityChanged(KWin::Toplevel *t, qreal oldOpacity); void slotOpacityChanged(KWin::Toplevel *t, qreal oldOpacity);
void slotClientModalityChanged(); void slotClientModalityChanged();
void slotGeometryShapeChanged(KWin::Toplevel *t, const QRect &old); void slotGeometryShapeChanged(KWin::Toplevel *t, const QRect &old);

3
scripting/workspace_wrapper.cpp
View file

@ -248,7 +248,8 @@ void WorkspaceWrapper::setupClientConnections(KWin::Client *client)
connect(client, &Client::clientUnminimized, this, &WorkspaceWrapper::clientUnminimized); connect(client, &Client::clientUnminimized, this, &WorkspaceWrapper::clientUnminimized);
connect(client, SIGNAL(clientManaging(KWin::Client*)), SIGNAL(clientManaging(KWin::Client*))); connect(client, SIGNAL(clientManaging(KWin::Client*)), SIGNAL(clientManaging(KWin::Client*)));
connect(client, SIGNAL(clientFullScreenSet(KWin::Client*,bool,bool)), SIGNAL(clientFullScreenSet(KWin::Client*,bool,bool))); connect(client, SIGNAL(clientFullScreenSet(KWin::Client*,bool,bool)), SIGNAL(clientFullScreenSet(KWin::Client*,bool,bool)));
connect(client, SIGNAL(clientMaximizedStateChanged(KWin::Client*,bool,bool)), SIGNAL(clientMaximizeSet(KWin::Client*,bool,bool))); connect(client, static_cast<void (Client::*)(KWin::AbstractClient*, bool, bool)>(&Client::clientMaximizedStateChanged),
this, &WorkspaceWrapper::clientMaximizeSet);
} }
void WorkspaceWrapper::showOutline(const QRect &geometry) void WorkspaceWrapper::showOutline(const QRect &geometry)

2
scripting/workspace_wrapper.h
View file

@ -96,7 +96,7 @@ Q_SIGNALS:
void clientMinimized(KWin::AbstractClient *client); void clientMinimized(KWin::AbstractClient *client);
void clientUnminimized(KWin::AbstractClient *client); void clientUnminimized(KWin::AbstractClient *client);
void clientRestored(KWin::Client *client); void clientRestored(KWin::Client *client);
void clientMaximizeSet(KWin::Client *client, bool h, bool v); void clientMaximizeSet(KWin::AbstractClient *client, bool h, bool v);
void killWindowCalled(KWin::Client *client); void killWindowCalled(KWin::Client *client);
void clientActivated(KWin::AbstractClient *client); void clientActivated(KWin::AbstractClient *client);
void clientFullScreenSet(KWin::Client *client, bool fullScreen, bool user); void clientFullScreenSet(KWin::Client *client, bool fullScreen, bool user);