mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-23 00:05:59 +01:00
IME: Fix ime popup coordinates and artifacts (#5373)
* ime: fix incorrect popup coordinate * ime: fix popup artifacts
This commit is contained in:
parent
108163f1e5
commit
db1506130b
1 changed files with 5 additions and 5 deletions
|
@ -77,10 +77,8 @@ void CInputPopup::damageEntire() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector2D pos = OWNER->getSurfaceBoxGlobal().value_or(CBox{0, 0, 0, 0}).pos();
|
Vector2D pos = OWNER->getSurfaceBoxGlobal().value_or(CBox{0, 0, 0, 0}).pos() + lastBoxLocal.pos();
|
||||||
CBox global = lastBoxLocal.copy().translate(pos);
|
g_pHyprRenderer->damageBox(pos.x, pos.y, surface.wlr()->current.width, surface.wlr()->current.height);
|
||||||
|
|
||||||
g_pHyprRenderer->damageBox(&global);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CInputPopup::damageSurface() {
|
void CInputPopup::damageSurface() {
|
||||||
|
@ -127,7 +125,9 @@ void CInputPopup::updateBox() {
|
||||||
CMonitor* pMonitor = g_pCompositor->getMonitorFromVector(parentBox.middle());
|
CMonitor* pMonitor = g_pCompositor->getMonitorFromVector(parentBox.middle());
|
||||||
|
|
||||||
if (cursorBoxLocal.y + parentBox.y + surface.wlr()->current.height + cursorBoxLocal.height > pMonitor->vecPosition.y + pMonitor->vecSize.y)
|
if (cursorBoxLocal.y + parentBox.y + surface.wlr()->current.height + cursorBoxLocal.height > pMonitor->vecPosition.y + pMonitor->vecSize.y)
|
||||||
cursorBoxLocal.y -= surface.wlr()->current.height + cursorBoxLocal.height;
|
cursorBoxLocal.y -= surface.wlr()->current.height;
|
||||||
|
else
|
||||||
|
cursorBoxLocal.y += cursorBoxLocal.height;
|
||||||
|
|
||||||
if (cursorBoxLocal.x + parentBox.x + surface.wlr()->current.width > pMonitor->vecPosition.x + pMonitor->vecSize.x)
|
if (cursorBoxLocal.x + parentBox.x + surface.wlr()->current.width > pMonitor->vecPosition.x + pMonitor->vecSize.x)
|
||||||
cursorBoxLocal.x -= (cursorBoxLocal.x + parentBox.x + surface.wlr()->current.width) - (pMonitor->vecPosition.x + pMonitor->vecSize.x);
|
cursorBoxLocal.x -= (cursorBoxLocal.x + parentBox.x + surface.wlr()->current.width) - (pMonitor->vecPosition.x + pMonitor->vecSize.x);
|
||||||
|
|
Loading…
Reference in a new issue