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

Merge branch 'KDE/4.10'

Browse source
This commit is contained in:
Martin Gräßlin 2013-04-02 08:18:40 +02:00
commit 556d71933b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client.cpp
View file

@ -1574,6 +1574,7 @@ void Client::updateActivities(bool includeTransients)
m_blockedActivityUpdatesRequireTransients |= includeTransients; m_blockedActivityUpdatesRequireTransients |= includeTransients;
return; return;
} }
emit activitiesChanged(this);
m_blockedActivityUpdatesRequireTransients = false; // reset m_blockedActivityUpdatesRequireTransients = false; // reset
if (includeTransients) if (includeTransients)
workspace()->updateOnAllActivitiesOfTransients(this); workspace()->updateOnAllActivitiesOfTransients(this);

3
toplevel.h
View file

@ -152,7 +152,7 @@ class Toplevel
* See http://standards.freedesktop.org/wm-spec/wm-spec-latest.html . * See http://standards.freedesktop.org/wm-spec/wm-spec-latest.html .
*/ */
Q_PROPERTY(int windowType READ windowType) Q_PROPERTY(int windowType READ windowType)
Q_PROPERTY(QStringList activities READ activities) Q_PROPERTY(QStringList activities READ activities NOTIFY activitiesChanged)
/** /**
* Whether this Toplevel is managed by KWin (it has control over its placement and other * Whether this Toplevel is managed by KWin (it has control over its placement and other
* aspects, as opposed to override-redirect windows that are entirely handled by the application). * aspects, as opposed to override-redirect windows that are entirely handled by the application).
@ -325,6 +325,7 @@ signals:
* schedule a repaint of the scene. * schedule a repaint of the scene.
**/ **/
void needsRepaint(); void needsRepaint();
void activitiesChanged(KWin::Toplevel* toplevel);
protected: protected:
virtual ~Toplevel(); virtual ~Toplevel();