Remove asserts from Compositor and wrap Toplevel::compositing() around Workspace::compositing()
BUG: 312712 FIXED-IN: 4.10 REVIEW: 108321icc-effect-5.14.5
parent
a1c76f4df2
commit
412afa3dcd
|
@ -935,8 +935,7 @@ void Toplevel::damageNotifyEvent(XDamageNotifyEvent* e)
|
||||||
|
|
||||||
bool Toplevel::compositing() const
|
bool Toplevel::compositing() const
|
||||||
{
|
{
|
||||||
Compositor *c = Compositor::self();
|
return Workspace::self()->compositing();
|
||||||
return c && c->hasScene();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client::damageNotifyEvent(XDamageNotifyEvent* e)
|
void Client::damageNotifyEvent(XDamageNotifyEvent* e)
|
||||||
|
|
|
@ -139,7 +139,6 @@ public:
|
||||||
* @see createCompositor
|
* @see createCompositor
|
||||||
**/
|
**/
|
||||||
static Compositor *self() {
|
static Compositor *self() {
|
||||||
Q_ASSERT(s_compositor);
|
|
||||||
return s_compositor;
|
return s_compositor;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
|
10
workspace.h
10
workspace.h
|
@ -525,6 +525,11 @@ public:
|
||||||
return movingClient;
|
return movingClient;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @returns Whether we have a Compositor and it is active (Scene created)
|
||||||
|
**/
|
||||||
|
bool compositing() const;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
// Keybindings
|
// Keybindings
|
||||||
void slotSwitchDesktopNext();
|
void slotSwitchDesktopNext();
|
||||||
|
@ -745,11 +750,6 @@ private:
|
||||||
static NET::WindowType txtToWindowType(const char* txt);
|
static NET::WindowType txtToWindowType(const char* txt);
|
||||||
static bool sessionInfoWindowTypeMatch(Client* c, SessionInfo* info);
|
static bool sessionInfoWindowTypeMatch(Client* c, SessionInfo* info);
|
||||||
|
|
||||||
/**
|
|
||||||
* @returns Whether we have a Compositor and it is active (Scene created)
|
|
||||||
**/
|
|
||||||
bool compositing() const;
|
|
||||||
|
|
||||||
Client* active_client;
|
Client* active_client;
|
||||||
Client* last_active_client;
|
Client* last_active_client;
|
||||||
Client* most_recently_raised; // Used ONLY by raiseOrLowerClient()
|
Client* most_recently_raised; // Used ONLY by raiseOrLowerClient()
|
||||||
|
|
Loading…
Reference in New Issue