Changeset View
Changeset View
Standalone View
Standalone View
screenedge.cpp
Show First 20 Lines • Show All 532 Lines • ▼ Show 20 Line(s) | |||||
533 | 533 | | |||
534 | void Edge::checkBlocking() | 534 | void Edge::checkBlocking() | ||
535 | { | 535 | { | ||
536 | if (isCorner()) { | 536 | if (isCorner()) { | ||
537 | return; | 537 | return; | ||
538 | } | 538 | } | ||
539 | bool newValue = false; | 539 | bool newValue = false; | ||
540 | if (AbstractClient *client = Workspace::self()->activeClient()) { | 540 | if (AbstractClient *client = Workspace::self()->activeClient()) { | ||
541 | newValue = client->isFullScreen() && client->geometry().contains(m_geometry.center()); | 541 | newValue = client->isFullScreen() && client->frameGeometry().contains(m_geometry.center()); | ||
542 | } | 542 | } | ||
543 | if (newValue == m_blocked) { | 543 | if (newValue == m_blocked) { | ||
544 | return; | 544 | return; | ||
545 | } | 545 | } | ||
546 | const bool wasTouch = activatesForTouchGesture(); | 546 | const bool wasTouch = activatesForTouchGesture(); | ||
547 | m_blocked = newValue; | 547 | m_blocked = newValue; | ||
548 | if (wasTouch != activatesForTouchGesture()) { | 548 | if (wasTouch != activatesForTouchGesture()) { | ||
549 | emit activatesForTouchGestureChanged(); | 549 | emit activatesForTouchGestureChanged(); | ||
▲ Show 20 Lines • Show All 707 Lines • ▼ Show 20 Line(s) | |||||
1257 | } | 1257 | } | ||
1258 | 1258 | | |||
1259 | void ScreenEdges::createEdgeForClient(AbstractClient *client, ElectricBorder border) | 1259 | void ScreenEdges::createEdgeForClient(AbstractClient *client, ElectricBorder border) | ||
1260 | { | 1260 | { | ||
1261 | int y = 0; | 1261 | int y = 0; | ||
1262 | int x = 0; | 1262 | int x = 0; | ||
1263 | int width = 0; | 1263 | int width = 0; | ||
1264 | int height = 0; | 1264 | int height = 0; | ||
1265 | const QRect geo = client->geometry(); | 1265 | const QRect geo = client->frameGeometry(); | ||
1266 | const QRect fullArea = workspace()->clientArea(FullArea, 0, 1); | 1266 | const QRect fullArea = workspace()->clientArea(FullArea, 0, 1); | ||
1267 | for (int i = 0; i < screens()->count(); ++i) { | 1267 | for (int i = 0; i < screens()->count(); ++i) { | ||
1268 | const QRect screen = screens()->geometry(i); | 1268 | const QRect screen = screens()->geometry(i); | ||
1269 | if (!screen.contains(geo)) { | 1269 | if (!screen.contains(geo)) { | ||
1270 | // ignoring Clients having a geometry overlapping with multiple screens | 1270 | // ignoring Clients having a geometry overlapping with multiple screens | ||
1271 | // this would make the code more complex. If it's needed in future it can be added | 1271 | // this would make the code more complex. If it's needed in future it can be added | ||
1272 | continue; | 1272 | continue; | ||
1273 | } | 1273 | } | ||
▲ Show 20 Lines • Show All 222 Lines • Show Last 20 Lines |