cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

layout: fit floating window on toggle to float (#12139)

Browse source
This commit is contained in:
Vaxry 2025-10-29 23:21:28 +00:00 • committed by GitHub
parent 83a0a62004
commit 6ade4d58ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 108 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/desktop/Window.cpp
View file

@ -257,7 +257,10 @@ CBox CWindow::getWindowBoxUnified(uint64_t properties) {
return {PMONITOR->m_position.x, PMONITOR->m_position.y, PMONITOR->m_size.x, PMONITOR->m_size.y};
}
CBox box = {m_realPosition->value().x, m_realPosition->value().y, m_realSize->value().x, m_realSize->value().y};
const auto POS = m_realPosition->value();
const auto SIZE = m_realSize->value();
CBox box{POS, SIZE};
box.addExtents(getWindowExtentsUnified(properties));
return box;

39
src/layout/IHyprLayout.cpp
View file

@ -790,17 +790,16 @@ void IHyprLayout::changeWindowFloatingMode(PHLWINDOW pWindow) {
CBox wb = {pWindow->m_realPosition->goal() + (pWindow->m_realSize->goal() - pWindow->m_lastFloatingSize) / 2.f, pWindow->m_lastFloatingSize};
wb.round();
if (!(pWindow->m_isFloating && pWindow->m_isPseudotiled) && DELTALESSTHAN(pWindow->m_realSize->value().x, pWindow->m_lastFloatingSize.x, 10) &&
DELTALESSTHAN(pWindow->m_realSize->value().y, pWindow->m_lastFloatingSize.y, 10)) {
if (!(pWindow->m_isFloating && pWindow->m_isPseudotiled) && DELTALESSTHAN(pWindow->m_realSize->goal().x, pWindow->m_lastFloatingSize.x, 10) &&
DELTALESSTHAN(pWindow->m_realSize->goal().y, pWindow->m_lastFloatingSize.y, 10)) {
wb = {wb.pos() + Vector2D{10, 10}, wb.size() - Vector2D{20, 20}};
}
*pWindow->m_realPosition = wb.pos();
*pWindow->m_realSize = wb.size();
pWindow->m_size = wb.size();
pWindow->m_position = wb.pos();
fitFloatingWindowOnMonitor(pWindow, wb);
g_pHyprRenderer->damageMonitor(pWindow->m_monitor.lock());
pWindow->unsetWindowData(PRIORITY_LAYOUT);
@ -815,6 +814,36 @@ void IHyprLayout::changeWindowFloatingMode(PHLWINDOW pWindow) {
g_pHyprRenderer->damageWindow(pWindow);
}
void IHyprLayout::fitFloatingWindowOnMonitor(PHLWINDOW w, std::optional<CBox> tb) {
if (!w->m_isFloating)
return;
const auto PMONITOR = w->m_monitor.lock();
if (!PMONITOR)
return;
const auto EXTENTS = w->getWindowExtentsUnified(RESERVED_EXTENTS | INPUT_EXTENTS);
CBox targetBoxMonLocal = tb.value_or(w->getWindowMainSurfaceBox()).translate(-PMONITOR->m_position).addExtents(EXTENTS);
if (targetBoxMonLocal.w < PMONITOR->m_size.x) {
if (targetBoxMonLocal.x < 0)
targetBoxMonLocal.x = 0;
else if (targetBoxMonLocal.x + targetBoxMonLocal.w > PMONITOR->m_size.x)
targetBoxMonLocal.x = PMONITOR->m_size.x - targetBoxMonLocal.w;
}
if (targetBoxMonLocal.h < PMONITOR->m_size.y) {
if (targetBoxMonLocal.y < 0)
targetBoxMonLocal.y = 0;
else if (targetBoxMonLocal.y + targetBoxMonLocal.h > PMONITOR->m_size.y)
targetBoxMonLocal.y = PMONITOR->m_size.y - targetBoxMonLocal.h;
}
*w->m_realPosition = (targetBoxMonLocal.pos() + PMONITOR->m_position + EXTENTS.topLeft).round();
*w->m_realSize = (targetBoxMonLocal.size() - EXTENTS.topLeft - EXTENTS.bottomRight).round();
}
void IHyprLayout::moveActiveWindow(const Vector2D& delta, PHLWINDOW pWindow) {
const auto PWINDOW = pWindow ? pWindow : g_pCompositor->m_lastWindow.lock();

5
src/layout/IHyprLayout.hpp
View file

@ -225,6 +225,11 @@ class IHyprLayout {
*/
virtual void performSnap(Vector2D& sourcePos, Vector2D& sourceSize, PHLWINDOW DRAGGINGWINDOW, const eMouseBindMode MODE, const int CORNER, const Vector2D& BEGINSIZE);
/*
Fits a floating window on its monitor
*/
virtual void fitFloatingWindowOnMonitor(PHLWINDOW w, std::optional<CBox> targetBox = std::nullopt);
private:
int m_mouseMoveEventCount;
Vector2D m_beginDragXY;