internal: Use vecnotinrect instead of !vecinrect (#10262)
* monitor: use vecnotinrect * inputmanager: vecnotinrect * clang format
This commit is contained in:
parent
cdf5736f1a
commit
3465efcdc1
2 changed files with 4 additions and 4 deletions
|
|
@ -1239,12 +1239,12 @@ void CMonitor::setSpecialWorkspace(const PHLWORKSPACE& pWorkspace) {
|
|||
w->setAnimationsToMove();
|
||||
|
||||
const auto MIDDLE = w->middle();
|
||||
if (w->m_isFloating && !VECINRECT(MIDDLE, m_position.x, m_position.y, m_position.x + m_size.x, m_position.y + m_size.y) && !w->isX11OverrideRedirect()) {
|
||||
if (w->m_isFloating && VECNOTINRECT(MIDDLE, m_position.x, m_position.y, m_position.x + m_size.x, m_position.y + m_size.y) && !w->isX11OverrideRedirect()) {
|
||||
// if it's floating and the middle isnt on the current mon, move it to the center
|
||||
const auto PMONFROMMIDDLE = g_pCompositor->getMonitorFromVector(MIDDLE);
|
||||
Vector2D pos = w->m_realPosition->goal();
|
||||
if (!VECINRECT(MIDDLE, PMONFROMMIDDLE->m_position.x, PMONFROMMIDDLE->m_position.y, PMONFROMMIDDLE->m_position.x + PMONFROMMIDDLE->m_size.x,
|
||||
PMONFROMMIDDLE->m_position.y + PMONFROMMIDDLE->m_size.y)) {
|
||||
if (VECNOTINRECT(MIDDLE, PMONFROMMIDDLE->m_position.x, PMONFROMMIDDLE->m_position.y, PMONFROMMIDDLE->m_position.x + PMONFROMMIDDLE->m_size.x,
|
||||
PMONFROMMIDDLE->m_position.y + PMONFROMMIDDLE->m_size.y)) {
|
||||
// not on any monitor, center
|
||||
pos = middle() / 2.f - w->m_realSize->goal() / 2.f;
|
||||
} else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue