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

add internal rounding

Browse source 
modified:   src/render/decorations/CHyprGroupBarDecoration.cpp

Signed-off-by: MightyPlaza <123664421+MightyPlaza@users.noreply.github.com>
This commit is contained in:
MightyPlaza 2023-09-06 17:32:33 +01:00
parent 71e9b7cb5b
commit cc26620121
No known key found for this signature in database
GPG key ID: 284C27FD27A6DC0D
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,6 +27,7 @@ eDecorationType CHyprGroupBarDecoration::getDecorationType() {
constexpr int BAR_INDICATOR_HEIGHT = 3; constexpr int BAR_INDICATOR_HEIGHT = 3;
constexpr int BAR_INTERNAL_PADDING = 3; constexpr int BAR_INTERNAL_PADDING = 3;
constexpr int BAR_EXTERNAL_PADDING = 3; constexpr int BAR_EXTERNAL_PADDING = 3;
constexpr int BAR_HORIZONTAL_PADDING = 5;
constexpr int BAR_TEXT_PAD = 3; constexpr int BAR_TEXT_PAD = 3;
// //
@ -93,8 +94,7 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
const int ROUNDING = !m_pWindow->m_sSpecialRenderData.rounding ? 0 : m_pWindow->rounding(); const int ROUNDING = !m_pWindow->m_sSpecialRenderData.rounding ? 0 : m_pWindow->rounding();
const int BORDERSIZE = m_pWindow->getRealBorderSize(); const int BORDERSIZE = m_pWindow->getRealBorderSize();
const int PAD = 2; //2px const int BARW = (m_vLastWindowSize.x - 2 * ROUNDING - BAR_HORIZONTAL_PADDING * (barsToDraw - 1)) / barsToDraw;
const int BARW = (m_vLastWindowSize.x - 2 * ROUNDING - PAD * (barsToDraw - 1)) / barsToDraw;
// TODO: check for invalid config // TODO: check for invalid config
if (BARW <= 0) if (BARW <= 0)
@ -166,7 +166,7 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
CColor color = CColor color =
m_dwGroupMembers[i] == g_pCompositor->m_pLastWindow ? ((CGradientValueData*)PCOLACTIVE->get())->m_vColors[0] : ((CGradientValueData*)PCOLINACTIVE->get())->m_vColors[0]; m_dwGroupMembers[i] == g_pCompositor->m_pLastWindow ? ((CGradientValueData*)PCOLACTIVE->get())->m_vColors[0] : ((CGradientValueData*)PCOLINACTIVE->get())->m_vColors[0];
color.a *= a; color.a *= a;
g_pHyprOpenGL->renderRect(&barBox, color); g_pHyprOpenGL->renderRect(&barBox, color, std::sqrt(m_iBarHeight) / 2);
// render title if necessary // render title if necessary
if (*PRENDERTITLES) { if (*PRENDERTITLES) {
@ -185,9 +185,9 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
&gradBox, 1.0); &gradBox, 1.0);
} }
barBox.x += (PAD + BARW) * pMonitor->scale; barBox.x += (BAR_HORIZONTAL_PADDING + BARW) * pMonitor->scale;
gradBox.x += (PAD + BARW) * pMonitor->scale; gradBox.x += (BAR_HORIZONTAL_PADDING + BARW) * pMonitor->scale;
textBox.x += (PAD + BARW) * pMonitor->scale; textBox.x += (BAR_HORIZONTAL_PADDING + BARW) * pMonitor->scale;
} }
if (*PRENDERTITLES) if (*PRENDERTITLES)