Skip to content

Commit

Permalink
window: fix resizes with an update callback
Browse files Browse the repository at this point in the history
  • Loading branch information
PaideiaDilemma committed Feb 2, 2025
1 parent 64fefa3 commit aba6ec5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 5 additions & 0 deletions src/desktop/Window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,11 @@ void CWindow::onMap() {
*m_fBorderAngleAnimationProgress = 1.f;
}

m_vRealSize->setUpdateCallback([this](auto) {
if (m_bIsFloating)
sendWindowSize(m_vRealSize->goal());
});

m_fMovingFromWorkspaceAlpha->setValueAndWarp(1.F);

g_pCompositor->m_vWindowFocusHistory.push_back(m_pSelf);
Expand Down
6 changes: 1 addition & 5 deletions src/events/Windows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -680,12 +680,8 @@ void Events::listener_mapWindow(void* owner, void* data) {
if (PMONITOR && PWINDOW->isX11OverrideRedirect())
PWINDOW->m_fX11SurfaceScaledBy = PMONITOR->scale;

// Fix some X11 popups being invisible / having incorrect size on open.
// What the ACTUAL FUCK is going on?????? I HATE X11
if (!PWINDOW->isX11OverrideRedirect() && PWINDOW->m_bIsX11 && PWINDOW->m_bIsFloating) {
PWINDOW->sendWindowSize(PWINDOW->m_vRealSize->goal(), true, PWINDOW->m_vRealPosition->goal() - Vector2D{1, 1});
if (!PWINDOW->isX11OverrideRedirect() && PWINDOW->m_bIsX11 && PWINDOW->m_bIsFloating)
PWINDOW->sendWindowSize(PWINDOW->m_vRealSize->goal(), true);
}
}

void Events::listener_unmapWindow(void* owner, void* data) {
Expand Down

0 comments on commit aba6ec5

Please sign in to comment.