diff options
| author | ItsOhen <TNordfeldt@gmail.com> | 2025-09-13 16:37:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-13 16:37:02 +0200 |
| commit | 16c18dde24450cce451f102fa09b8f7b60060306 (patch) | |
| tree | 288b7d730a8a6008b2eeae2fdce4db85ec723c03 /src | |
| parent | adbf7c8663cfbc91fca78d3504fa8f73ce4bd23a (diff) | |
windows: fix no decorate not disabling borders (#11673)
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop/Window.cpp | 4 | ||||
| -rw-r--r-- | src/render/decorations/CHyprBorderDecoration.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp index 78f12a11..71b78ded 100644 --- a/src/desktop/Window.cpp +++ b/src/desktop/Window.cpp @@ -1231,7 +1231,7 @@ void CWindow::updateWindowData(const SWorkspaceRule& workspaceRule) { } int CWindow::getRealBorderSize() { - if (m_windowData.noBorder.valueOrDefault() || (m_workspace && isEffectiveInternalFSMode(FSMODE_FULLSCREEN))) + if (m_windowData.noBorder.valueOrDefault() || (m_workspace && isEffectiveInternalFSMode(FSMODE_FULLSCREEN)) || !m_windowData.decorate.valueOrDefault()) return 0; static auto PBORDERSIZE = CConfigValue<Hyprlang::INT>("general:border_size"); @@ -1909,4 +1909,4 @@ SP<CWLSurfaceResource> CWindow::getSolitaryResource() { } return nullptr; -}
\ No newline at end of file +} diff --git a/src/render/decorations/CHyprBorderDecoration.cpp b/src/render/decorations/CHyprBorderDecoration.cpp index 1ba60f0c..33ffcb60 100644 --- a/src/render/decorations/CHyprBorderDecoration.cpp +++ b/src/render/decorations/CHyprBorderDecoration.cpp @@ -157,5 +157,6 @@ std::string CHyprBorderDecoration::getDisplayName() { } bool CHyprBorderDecoration::doesntWantBorders() { - return m_window->m_windowData.noBorder.valueOrDefault() || m_window->m_X11DoesntWantBorders || m_window->getRealBorderSize() == 0; + return m_window->m_windowData.noBorder.valueOrDefault() || m_window->m_X11DoesntWantBorders || m_window->getRealBorderSize() == 0 || + !m_window->m_windowData.decorate.valueOrDefault(); } |