hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-25 06:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

protect against rounding * 2 > box size

Browse source 
modified:   src/Window.cpp
modified:   src/render/decorations/CHyprGroupBarDecoration.cpp
This commit is contained in:
MightyPlaza 2023-10-07 13:51:34 +01:00
parent 26aabb14e3
commit 3451e31739
No known key found for this signature in database
GPG key ID: 284C27FD27A6DC0D
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Window.cpp
View file

@ -930,10 +930,14 @@ int CWindow::getRealRounding() {
if (!m_sSpecialRenderData.rounding) if (!m_sSpecialRenderData.rounding)
return 0; return 0;
if (m_sAdditionalConfigData.rounding.toUnderlying() != -1) int rounding;
return m_sAdditionalConfigData.rounding.toUnderlying();
return g_pConfigManager->getConfigValuePtr("decoration:rounding")->intValue; if (m_sAdditionalConfigData.rounding.toUnderlying() != -1)
rounding = m_sAdditionalConfigData.rounding.toUnderlying();
else
rounding = g_pConfigManager->getConfigValuePtr("decoration:rounding")->intValue;
return std::min(rounding, (int)std::min(m_vRealSize.vec().x, m_vRealSize.vec().y) / 2);
} }
int CWindow::getRealBorderSize() { int CWindow::getRealBorderSize() {

6
src/render/decorations/CHyprGroupBarDecoration.cpp
View file

@ -107,9 +107,6 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
float currentOffset = BAR_HORIZONTAL_PADDING; float currentOffset = BAR_HORIZONTAL_PADDING;
if (m_fBarWidth <= 0)
return;
// Bottom left of groupbar // Bottom left of groupbar
Vector2D pos = Vector2D( Vector2D pos = Vector2D(
m_vLastWindowPos.x - pMonitor->vecPosition.x + offset.x + ROUNDING, m_vLastWindowPos.x - pMonitor->vecPosition.x + offset.x + ROUNDING,
@ -184,12 +181,11 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
g_pHyprOpenGL->renderRect(&barBox, color, std::sqrt(m_iBarHeight) / 2); g_pHyprOpenGL->renderRect(&barBox, color, std::sqrt(m_iBarHeight) / 2);
// render title if necessary // render title if necessary
if (*PRENDERTITLES) { if (*PRENDERTITLES && textBox.width > 0 && textBox.height > 0) {
CTitleTex* pTitleTex = textureFromTitle(m_dwGroupMembers[i]->m_szTitle); CTitleTex* pTitleTex = textureFromTitle(m_dwGroupMembers[i]->m_szTitle);
if (!pTitleTex) if (!pTitleTex)
pTitleTex = m_sTitleTexs.titleTexs.emplace_back(std::make_unique<CTitleTex>(m_dwGroupMembers[i], Vector2D(textBox.width, textBox.height))).get(); pTitleTex = m_sTitleTexs.titleTexs.emplace_back(std::make_unique<CTitleTex>(m_dwGroupMembers[i], Vector2D(textBox.width, textBox.height))).get();
if (textBox.width > 0 && textBox.height > 0)
g_pHyprOpenGL->renderTexture(pTitleTex->tex, &textBox, 1.f); g_pHyprOpenGL->renderTexture(pTitleTex->tex, &textBox, 1.f);
} }