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

windows: fix no decorate not disabling borders (#11673)

Browse source
This commit is contained in:
ItsOhen 2025-09-13 16:37:02 +02:00 • committed by GitHub
parent adbf7c8663
commit 16c18dde24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/desktop/Window.cpp
View file

@ -1231,7 +1231,7 @@ void CWindow::updateWindowData(const SWorkspaceRule& workspaceRule) {
} }
int CWindow::getRealBorderSize() { 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; return 0;
static auto PBORDERSIZE = CConfigValue<Hyprlang::INT>("general:border_size"); static auto PBORDERSIZE = CConfigValue<Hyprlang::INT>("general:border_size");
@ -1909,4 +1909,4 @@ SP<CWLSurfaceResource> CWindow::getSolitaryResource() {
} }
return nullptr; return nullptr;
} }

3
src/render/decorations/CHyprBorderDecoration.cpp
View file

@ -157,5 +157,6 @@ std::string CHyprBorderDecoration::getDisplayName() {
} }
bool CHyprBorderDecoration::doesntWantBorders() { 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();
} }