Changeset View
Changeset View
Standalone View
Standalone View
xdgshellclient.cpp
Show First 20 Lines • Show All 216 Lines • ▼ Show 20 Line(s) | 216 | if (requestedMaximizeMode() != MaximizeRestore) { | |||
---|---|---|---|---|---|
217 | needsPlacement = false; | 217 | needsPlacement = false; | ||
218 | } | 218 | } | ||
219 | 219 | | |||
220 | discardTemporaryRules(); | 220 | discardTemporaryRules(); | ||
221 | RuleBook::self()->discardUsed(this, false); // Remove Apply Now rules. | 221 | RuleBook::self()->discardUsed(this, false); // Remove Apply Now rules. | ||
222 | updateWindowRules(Rules::All); | 222 | updateWindowRules(Rules::All); | ||
223 | } | 223 | } | ||
224 | 224 | | |||
225 | if (isFullScreen()) { | ||||
226 | needsPlacement = false; | ||||
227 | } | ||||
228 | | ||||
225 | if (needsPlacement) { | 229 | if (needsPlacement) { | ||
226 | const QRect area = workspace()->clientArea(PlacementArea, Screens::self()->current(), desktop()); | 230 | const QRect area = workspace()->clientArea(PlacementArea, Screens::self()->current(), desktop()); | ||
227 | placeIn(area); | 231 | placeIn(area); | ||
zzag: Please do instead
```lang=cpp
if (isFullScreen()) {
needsPlacement = false;
}
``` | |||||
228 | } | 232 | } | ||
229 | 233 | | |||
230 | m_requestGeometryBlockCounter--; | 234 | m_requestGeometryBlockCounter--; | ||
231 | if (m_requestGeometryBlockCounter == 0) { | 235 | if (m_requestGeometryBlockCounter == 0) { | ||
232 | requestGeometry(m_blockedRequestGeometry); | 236 | requestGeometry(m_blockedRequestGeometry); | ||
233 | } | 237 | } | ||
234 | 238 | | |||
235 | m_isInitialized = true; | 239 | m_isInitialized = true; | ||
▲ Show 20 Lines • Show All 1260 Lines • ▼ Show 20 Line(s) | |||||
1496 | } | 1500 | } | ||
1497 | 1501 | | |||
1498 | void XdgShellClient::updateMaximizeMode(MaximizeMode maximizeMode) | 1502 | void XdgShellClient::updateMaximizeMode(MaximizeMode maximizeMode) | ||
1499 | { | 1503 | { | ||
1500 | if (maximizeMode == m_maximizeMode) { | 1504 | if (maximizeMode == m_maximizeMode) { | ||
1501 | return; | 1505 | return; | ||
1502 | } | 1506 | } | ||
1503 | 1507 | | |||
1508 | if (!isMaximizable()) { | ||||
1509 | return; | ||||
1510 | } | ||||
zzag: Looks like an unrelated change. | |||||
1504 | m_maximizeMode = maximizeMode; | 1511 | m_maximizeMode = maximizeMode; | ||
1505 | updateWindowRules(Rules::MaximizeHoriz | Rules::MaximizeVert | Rules::Position | Rules::Size); | 1512 | updateWindowRules(Rules::MaximizeHoriz | Rules::MaximizeVert | Rules::Position | Rules::Size); | ||
1506 | 1513 | | |||
1507 | emit clientMaximizedStateChanged(this, m_maximizeMode); | 1514 | emit clientMaximizedStateChanged(this, m_maximizeMode); | ||
1508 | emit clientMaximizedStateChanged(this, m_maximizeMode & MaximizeHorizontal, m_maximizeMode & MaximizeVertical); | 1515 | emit clientMaximizedStateChanged(this, m_maximizeMode & MaximizeHorizontal, m_maximizeMode & MaximizeVertical); | ||
1509 | } | 1516 | } | ||
1510 | 1517 | | |||
1511 | bool XdgShellClient::hasStrut() const | 1518 | bool XdgShellClient::hasStrut() const | ||
▲ Show 20 Lines • Show All 435 Lines • Show Last 20 Lines |
Please do instead