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

change var name

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

Signed-off-by: MightyPlaza <123664421+MightyPlaza@users.noreply.github.com>
This commit is contained in:
MightyPlaza 2023-09-13 00:01:43 +01:00
parent db555b9ac9
commit 7aa0a88fb2
No known key found for this signature in database
GPG key ID: 284C27FD27A6DC0D
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,14 +101,14 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
return; return;
// Bottom left of groupbar // Bottom left of groupbar
Vector2D pos = Vector2D(m_vLastWindowPos.x - pMonitor->vecPosition.x + offset.x + ROUNDING, Vector2D pos = Vector2D(
std::floor(m_vLastWindowPos.y) - pMonitor->vecPosition.y + offset.y + m_vLastWindowPos.x - pMonitor->vecPosition.x + offset.x + ROUNDING,
(m_bOnTop ? (m_bInternalBorder ? 0 : -BORDERSIZE) : std::floor(m_vLastWindowPos.y) - pMonitor->vecPosition.y + offset.y +
std::floor(m_vLastWindowSize.y) + m_iBarInternalHeight + BAR_INTERNAL_PADDING + (m_bInternalBorder ? 0 : BORDERSIZE))); (m_bOnTop ? (m_bInternalBar ? 0 : -BORDERSIZE) : std::floor(m_vLastWindowSize.y) + m_iBarInternalHeight + BAR_INTERNAL_PADDING + (m_bInternalBar ? 0 : BORDERSIZE)));
wlr_box barBox = {pos.x, pos.y - m_iBarHeight + (m_bOnTop ? -BAR_INTERNAL_PADDING : 0), BARW, m_iBarHeight}; wlr_box barBox = {pos.x, pos.y - m_iBarHeight + (m_bOnTop ? -BAR_INTERNAL_PADDING : 0), BARW, m_iBarHeight};
wlr_box gradBox = {pos.x, pos.y - m_iBarHeight + (m_bOnTop ? -2 * BAR_INTERNAL_PADDING : -BAR_INTERNAL_PADDING) - m_iGradientHeight, BARW, m_iGradientHeight}; wlr_box gradBox = {pos.x, pos.y - m_iBarHeight + (m_bOnTop ? -2 * BAR_INTERNAL_PADDING : -BAR_INTERNAL_PADDING) - m_iGradientHeight, BARW, m_iGradientHeight};
wlr_box textBox = m_iGradientHeight != 0 ? gradBox : barBox; wlr_box textBox = m_iGradientHeight != 0 ? gradBox : barBox;
textBox.y += BAR_TEXT_PAD; textBox.y += BAR_TEXT_PAD;
textBox.height -= 2 * BAR_TEXT_PAD; textBox.height -= 2 * BAR_TEXT_PAD;
@ -116,7 +116,7 @@ void CHyprGroupBarDecoration::draw(CMonitor* pMonitor, float a, const Vector2D&
scaleBox(&textBox, pMonitor->scale); scaleBox(&textBox, pMonitor->scale);
scaleBox(&gradBox, pMonitor->scale); scaleBox(&gradBox, pMonitor->scale);
if (m_bInternalBorder) { if (m_bInternalBar) {
float alpha = m_pWindow->m_fAlpha.fl() * (m_pWindow->m_bPinned ? 1.f : PWORKSPACE->m_fAlpha.fl()) * m_pWindow->m_fActiveInactiveAlpha.fl(); float alpha = m_pWindow->m_fAlpha.fl() * (m_pWindow->m_bPinned ? 1.f : PWORKSPACE->m_fAlpha.fl()) * m_pWindow->m_fActiveInactiveAlpha.fl();
auto color = ((CGradientValueData*)PGROUPCOLBACKGROUND->get())->m_vColors[0]; auto color = ((CGradientValueData*)PGROUPCOLBACKGROUND->get())->m_vColors[0];
color = CColor(color.r, color.g, color.b, alpha); color = CColor(color.r, color.g, color.b, alpha);
@ -339,22 +339,22 @@ void CHyprGroupBarDecoration::refreshGradients() {
} }
void CHyprGroupBarDecoration::forceReload(CWindow* pWindow) { void CHyprGroupBarDecoration::forceReload(CWindow* pWindow) {
static auto* const PENABLED = &g_pConfigManager->getConfigValuePtr("group:groupbar:enabled")->intValue; static auto* const PENABLED = &g_pConfigManager->getConfigValuePtr("group:groupbar:enabled")->intValue;
static auto* const PMODE = &g_pConfigManager->getConfigValuePtr("group:groupbar:mode")->intValue; static auto* const PMODE = &g_pConfigManager->getConfigValuePtr("group:groupbar:mode")->intValue;
static auto* const PHEIGHT = &g_pConfigManager->getConfigValuePtr("group:groupbar:height")->intValue; static auto* const PHEIGHT = &g_pConfigManager->getConfigValuePtr("group:groupbar:height")->intValue;
static auto* const PINTERNALBORDER = &g_pConfigManager->getConfigValuePtr("group:groupbar:internal_bar")->intValue; static auto* const PINTERNALBAR = &g_pConfigManager->getConfigValuePtr("group:groupbar:internal_bar")->intValue;
m_bEnabled = *PENABLED; m_bEnabled = *PENABLED;
m_iBarInternalHeight = *PHEIGHT + (*PMODE == 1 ? BAR_INDICATOR_HEIGHT + BAR_INTERNAL_PADDING : 0); m_iBarInternalHeight = *PHEIGHT + (*PMODE == 1 ? BAR_INDICATOR_HEIGHT + BAR_INTERNAL_PADDING : 0);
m_iBarFullHeight = m_iBarInternalHeight + BAR_INTERNAL_PADDING + BAR_EXTERNAL_PADDING; m_iBarFullHeight = m_iBarInternalHeight + BAR_INTERNAL_PADDING + BAR_EXTERNAL_PADDING;
m_bOnTop = g_pConfigManager->getConfigValuePtr("group:groupbar:top")->intValue; m_bOnTop = g_pConfigManager->getConfigValuePtr("group:groupbar:top")->intValue;
m_bInternalBorder = *PINTERNALBORDER; m_bInternalBar = *PINTERNALBAR;
if (m_bEnabled) { if (m_bEnabled) {
m_seExtents.topLeft = Vector2D(0, m_bOnTop ? m_iBarFullHeight : 0); m_seExtents.topLeft = Vector2D(0, m_bOnTop ? m_iBarFullHeight : 0);
m_seExtents.bottomRight = Vector2D(0, m_bOnTop ? 0 : m_iBarFullHeight); m_seExtents.bottomRight = Vector2D(0, m_bOnTop ? 0 : m_iBarFullHeight);
m_seExtents.isInternalDecoration = *PINTERNALBORDER; m_seExtents.isInternalDecoration = *PINTERNALBAR;
} else { } else {
m_seExtents.topLeft = Vector2D(0, 0); m_seExtents.topLeft = Vector2D(0, 0);
m_seExtents.bottomRight = Vector2D(0, 0); m_seExtents.bottomRight = Vector2D(0, 0);
@ -371,8 +371,8 @@ CRegion CHyprGroupBarDecoration::getWindowDecorationRegion() {
const int BORDERSIZE = m_pWindow->getRealBorderSize(); const int BORDERSIZE = m_pWindow->getRealBorderSize();
return CRegion(m_vLastWindowPos.x + ROUNDING, return CRegion(m_vLastWindowPos.x + ROUNDING,
m_vLastWindowPos.y + m_vLastWindowPos.y +
(m_bOnTop ? -BAR_INTERNAL_PADDING - m_iBarInternalHeight - (m_bInternalBorder ? 0 : BORDERSIZE) : (m_bOnTop ? -BAR_INTERNAL_PADDING - m_iBarInternalHeight - (m_bInternalBar ? 0 : BORDERSIZE) :
m_vLastWindowSize.y + BAR_INTERNAL_PADDING + (m_bInternalBorder ? 0 : BORDERSIZE)), m_vLastWindowSize.y + BAR_INTERNAL_PADDING + (m_bInternalBar ? 0 : BORDERSIZE)),
m_vLastWindowSize.x - 2 * ROUNDING, m_iBarInternalHeight); m_vLastWindowSize.x - 2 * ROUNDING, m_iBarInternalHeight);
} }

2
src/render/decorations/CHyprGroupBarDecoration.hpp
View file

@ -51,7 +51,7 @@ class CHyprGroupBarDecoration : public IHyprWindowDecoration {
int m_iBarInternalHeight; int m_iBarInternalHeight;
int m_iBarFullHeight; int m_iBarFullHeight;
bool m_bOnTop; bool m_bOnTop;
bool m_bInternalBorder; bool m_bInternalBar;
int m_iBarHeight; int m_iBarHeight;
int m_iGradientHeight; int m_iGradientHeight;