Changeset View
Changeset View
Standalone View
Standalone View
geometry.cpp
Show All 39 Lines | |||||
40 | #include "effects.h" | 40 | #include "effects.h" | ||
41 | #include "screenedge.h" | 41 | #include "screenedge.h" | ||
42 | #include "internal_client.h" | 42 | #include "internal_client.h" | ||
43 | #include <QApplication> | 43 | #include <QApplication> | ||
44 | #include <QDebug> | 44 | #include <QDebug> | ||
45 | #include <QVarLengthArray> | 45 | #include <QVarLengthArray> | ||
46 | 46 | | |||
47 | #include "outline.h" | 47 | #include "outline.h" | ||
48 | #include "shell_client.h" | 48 | #include "xdgshellclient.h" | ||
49 | #include "wayland_server.h" | 49 | #include "wayland_server.h" | ||
50 | 50 | | |||
51 | #include <KDecoration2/Decoration> | 51 | #include <KDecoration2/Decoration> | ||
52 | #include <KDecoration2/DecoratedClient> | 52 | #include <KDecoration2/DecoratedClient> | ||
53 | 53 | | |||
54 | namespace KWin | 54 | namespace KWin | ||
55 | { | 55 | { | ||
56 | 56 | | |||
▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Line(s) | 193 | // qDebug() << "adjusting new_sarea: " << screens[ iS ]; | |||
196 | // ignore the geometry if it results in the screen getting removed completely | 196 | // ignore the geometry if it results in the screen getting removed completely | ||
197 | if (!geo.isEmpty()) { | 197 | if (!geo.isEmpty()) { | ||
198 | new_sareas[(*it)->desktop()][ iS ] = geo; | 198 | new_sareas[(*it)->desktop()][ iS ] = geo; | ||
199 | } | 199 | } | ||
200 | } | 200 | } | ||
201 | } | 201 | } | ||
202 | } | 202 | } | ||
203 | if (waylandServer()) { | 203 | if (waylandServer()) { | ||
204 | auto updateStrutsForWaylandClient = [&] (ShellClient *c) { | 204 | auto updateStrutsForWaylandClient = [&] (XdgShellClient *c) { | ||
205 | // assuming that only docks have "struts" and that all docks have a strut | 205 | // assuming that only docks have "struts" and that all docks have a strut | ||
206 | if (!c->hasStrut()) { | 206 | if (!c->hasStrut()) { | ||
207 | return; | 207 | return; | ||
208 | } | 208 | } | ||
209 | auto margins = [c] (const QRect &geometry) { | 209 | auto margins = [c] (const QRect &geometry) { | ||
210 | QMargins margins; | 210 | QMargins margins; | ||
211 | if (!geometry.intersects(c->geometry())) { | 211 | if (!geometry.intersects(c->geometry())) { | ||
212 | return margins; | 212 | return margins; | ||
▲ Show 20 Lines • Show All 3227 Lines • Show Last 20 Lines |