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

Add support for panel behavior in PlasmaShellSurface

Browse source 
Allows to set a PlasmaShellSurface with role panel to be either:
* AlwaysVisible
* AutoHide
* WindowsCanCover
* WindowsGoBelow
This commit is contained in:
Martin Gräßlin 2015-06-19 23:25:54 +02:00
parent 1a4c431ae7
commit 2f02ee45cf
2 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/wayland/plasmashell_interface.cpp
View file

@ -72,6 +72,7 @@ public:
QPoint m_globalPos; QPoint m_globalPos;
Role m_role; Role m_role;
bool m_positionSet = false; bool m_positionSet = false;
PanelBehavior m_panelBehavior = PanelBehavior::AlwaysVisible;
private: private:
// interface callbacks // interface callbacks
@ -79,9 +80,11 @@ private:
static void setOutputCallback(wl_client *client, wl_resource *resource, wl_resource *output); static void setOutputCallback(wl_client *client, wl_resource *resource, wl_resource *output);
static void setPositionCallback(wl_client *client, wl_resource *resource, int32_t x, int32_t y); static void setPositionCallback(wl_client *client, wl_resource *resource, int32_t x, int32_t y);
static void setRoleCallback(wl_client *client, wl_resource *resource, uint32_t role); static void setRoleCallback(wl_client *client, wl_resource *resource, uint32_t role);
static void setPanelBehaviorCallback(wl_client *client, wl_resource *resource, uint32_t flag);
void setPosition(const QPoint &globalPos); void setPosition(const QPoint &globalPos);
void setRole(uint32_t role); void setRole(uint32_t role);
void setPanelBehavior(org_kde_plasma_surface_panel_behavior behavior);
PlasmaShellSurfaceInterface *q_func() { PlasmaShellSurfaceInterface *q_func() {
return reinterpret_cast<PlasmaShellSurfaceInterface *>(q); return reinterpret_cast<PlasmaShellSurfaceInterface *>(q);
@ -149,7 +152,8 @@ const struct org_kde_plasma_surface_interface PlasmaShellSurfaceInterface::Priva
destroyCallback, destroyCallback,
setOutputCallback, setOutputCallback,
setPositionCallback, setPositionCallback,
setRoleCallback setRoleCallback,
setPanelBehaviorCallback
}; };
PlasmaShellSurfaceInterface::PlasmaShellSurfaceInterface(PlasmaShellInterface *shell, SurfaceInterface *parent, wl_resource *parentResource) PlasmaShellSurfaceInterface::PlasmaShellSurfaceInterface(PlasmaShellInterface *shell, SurfaceInterface *parent, wl_resource *parentResource)
@ -236,6 +240,38 @@ void PlasmaShellSurfaceInterface::Private::setRole(uint32_t role)
emit q->roleChanged(); emit q->roleChanged();
} }
void PlasmaShellSurfaceInterface::Private::setPanelBehaviorCallback(wl_client *client, wl_resource *resource, uint32_t flag)
{
auto s = cast<Private>(resource);
Q_ASSERT(client == *s->client);
s->setPanelBehavior(org_kde_plasma_surface_panel_behavior(flag));
}
void PlasmaShellSurfaceInterface::Private::setPanelBehavior(org_kde_plasma_surface_panel_behavior behavior)
{
PanelBehavior newBehavior = PanelBehavior::AlwaysVisible;
switch (behavior) {
case ORG_KDE_PLASMA_SURFACE_PANEL_BEHAVIOR_AUTO_HIDE:
newBehavior = PanelBehavior::AutoHide;
break;
case ORG_KDE_PLASMA_SURFACE_PANEL_BEHAVIOR_WINDOWS_CAN_COVER:
newBehavior = PanelBehavior::WindowsCanCover;
break;
case ORG_KDE_PLASMA_SURFACE_PANEL_BEHAVIOR_WINDOWS_GO_BELOW:
newBehavior = PanelBehavior::WindowsGoBelow;
break;
case ORG_KDE_PLASMA_SURFACE_PANEL_BEHAVIOR_ALWAYS_VISIBLE:
default:
break;
}
if (m_panelBehavior == newBehavior) {
return;
}
m_panelBehavior = newBehavior;
Q_Q(PlasmaShellSurfaceInterface);
emit q->panelBehaviorChanged();
}
QPoint PlasmaShellSurfaceInterface::position() const QPoint PlasmaShellSurfaceInterface::position() const
{ {
Q_D(); Q_D();
@ -254,5 +290,11 @@ bool PlasmaShellSurfaceInterface::isPositionSet() const
return d->m_positionSet; return d->m_positionSet;
} }
PlasmaShellSurfaceInterface::PanelBehavior PlasmaShellSurfaceInterface::panelBehavior() const
{
Q_D();
return d->m_panelBehavior;
}
} }
} }

8
src/wayland/plasmashell_interface.h
View file

@ -72,10 +72,18 @@ public:
Panel Panel
}; };
Role role() const; Role role() const;
enum class PanelBehavior {
AlwaysVisible,
AutoHide,
WindowsCanCover,
WindowsGoBelow
};
PanelBehavior panelBehavior() const;
Q_SIGNALS: Q_SIGNALS:
void positionChanged(); void positionChanged();
void roleChanged(); void roleChanged();
void panelBehaviorChanged();
private: private:
friend class PlasmaShellInterface; friend class PlasmaShellInterface;