hyprwm/hyprland-plugins
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprland-plugins.git synced 2024-11-24 03:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

borders++: make deco sticky, fix scaling issues (#227)

Browse source
This commit is contained in:
Tony Ngo 2024-09-30 01:29:56 +09:30 committed by GitHub
parent 4fcb465c9d
commit 13301eeede
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
borders-plus-plus/borderDeco.cpp
View file

@ -23,7 +23,7 @@ SDecorationPositioningInfo CBordersPlusPlus::getPositioningInfo() {
} }
SDecorationPositioningInfo info; SDecorationPositioningInfo info;
info.policy = DECORATION_POSITION_ABSOLUTE; info.policy = DECORATION_POSITION_STICKY;
info.reserved = true; info.reserved = true;
info.priority = 9990; info.priority = 9990;
info.edges = DECORATION_EDGE_BOTTOM | DECORATION_EDGE_LEFT | DECORATION_EDGE_RIGHT | DECORATION_EDGE_TOP; info.edges = DECORATION_EDGE_BOTTOM | DECORATION_EDGE_LEFT | DECORATION_EDGE_RIGHT | DECORATION_EDGE_TOP;
@ -44,11 +44,11 @@ SDecorationPositioningInfo CBordersPlusPlus::getPositioningInfo() {
} }
void CBordersPlusPlus::onPositioningReply(const SDecorationPositioningReply& reply) { void CBordersPlusPlus::onPositioningReply(const SDecorationPositioningReply& reply) {
; // ignored m_bAssignedGeometry = reply.assignedGeometry;
} }
uint64_t CBordersPlusPlus::getDecorationFlags() { uint64_t CBordersPlusPlus::getDecorationFlags() {
return 0; return DECORATION_PART_OF_MAIN_WINDOW;
} }
eDecorationLayer CBordersPlusPlus::getDecorationLayer() { eDecorationLayer CBordersPlusPlus::getDecorationLayer() {
@ -82,23 +82,38 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a) {
if (**PBORDERS < 1) if (**PBORDERS < 1)
return; return;
if (m_bAssignedGeometry.width < m_seExtents.topLeft.x + 1 || m_bAssignedGeometry.height < m_seExtents.topLeft.y + 1)
return;
const auto PWORKSPACE = PWINDOW->m_pWorkspace; const auto PWORKSPACE = PWINDOW->m_pWorkspace;
const auto WORKSPACEOFFSET = PWORKSPACE && !PWINDOW->m_bPinned ? PWORKSPACE->m_vRenderOffset.value() : Vector2D(); const auto WORKSPACEOFFSET = PWORKSPACE && !PWINDOW->m_bPinned ? PWORKSPACE->m_vRenderOffset.value() : Vector2D();
auto rounding = PWINDOW->rounding() == 0 ? 0 : PWINDOW->rounding() * pMonitor->scale + **PBORDERSIZE; auto rounding = PWINDOW->rounding() == 0 ? 0 : (PWINDOW->rounding() + **PBORDERSIZE) * pMonitor->scale;
const auto ORIGINALROUND = rounding == 0 ? 0 : PWINDOW->rounding() * pMonitor->scale + **PBORDERSIZE; const auto ORIGINALROUND = rounding == 0 ? 0 : (PWINDOW->rounding() + **PBORDERSIZE) * pMonitor->scale;
CBox fullBox = {m_vLastWindowPos.x, m_vLastWindowPos.y, m_vLastWindowSize.x, m_vLastWindowSize.y};
fullBox.translate(PWINDOW->m_vFloatingOffset - pMonitor->vecPosition + WORKSPACEOFFSET).scale(pMonitor->scale).expand(**PBORDERSIZE * pMonitor->scale); CBox fullBox = m_bAssignedGeometry;
fullBox.translate(g_pDecorationPositioner->getEdgeDefinedPoint(DECORATION_EDGE_BOTTOM | DECORATION_EDGE_LEFT | DECORATION_EDGE_RIGHT | DECORATION_EDGE_TOP, m_pWindow.lock()));
fullBox.translate(PWINDOW->m_vFloatingOffset - pMonitor->vecPosition + WORKSPACEOFFSET);
if (fullBox.width < 1 || fullBox.height < 1)
return;
double fullThickness = 0; double fullThickness = 0;
for (size_t i = 0; i < **PBORDERS; ++i) {
const int THISBORDERSIZE = **(PSIZES[i]) == -1 ? **PBORDERSIZE : (**PSIZES[i]);
fullThickness += THISBORDERSIZE;
}
fullBox.expand(-fullThickness).scale(pMonitor->scale).round();
for (size_t i = 0; i < **PBORDERS; ++i) { for (size_t i = 0; i < **PBORDERS; ++i) {
const int PREVBORDERSIZESCALED = i == 0 ? 0 : (**PSIZES[i - 1] == -1 ? **PBORDERSIZE : **(PSIZES[i - 1])) * pMonitor->scale; const int PREVBORDERSIZESCALED = i == 0 ? 0 : (**PSIZES[i - 1] == -1 ? **PBORDERSIZE : **(PSIZES[i - 1])) * pMonitor->scale;
const int THISBORDERSIZE = **(PSIZES[i]) == -1 ? **PBORDERSIZE : (**PSIZES[i]); const int THISBORDERSIZE = **(PSIZES[i]) == -1 ? **PBORDERSIZE : (**PSIZES[i]);
if (i != 0) { if (i != 0) {
rounding += rounding == 0 ? 0 : PREVBORDERSIZESCALED / pMonitor->scale; rounding += rounding == 0 ? 0 : PREVBORDERSIZESCALED;
fullBox.x -= PREVBORDERSIZESCALED; fullBox.x -= PREVBORDERSIZESCALED;
fullBox.y -= PREVBORDERSIZESCALED; fullBox.y -= PREVBORDERSIZESCALED;
fullBox.width += PREVBORDERSIZESCALED * 2; fullBox.width += PREVBORDERSIZESCALED * 2;
@ -112,13 +127,11 @@ void CBordersPlusPlus::draw(CMonitor* pMonitor, float a) {
g_pHyprOpenGL->renderBorder(&fullBox, CColor{(uint64_t) * *PCOLORS[i]}, **PNATURALROUND ? ORIGINALROUND : rounding, THISBORDERSIZE, a, g_pHyprOpenGL->renderBorder(&fullBox, CColor{(uint64_t) * *PCOLORS[i]}, **PNATURALROUND ? ORIGINALROUND : rounding, THISBORDERSIZE, a,
**PNATURALROUND ? ORIGINALROUND : -1); **PNATURALROUND ? ORIGINALROUND : -1);
fullThickness += THISBORDERSIZE;
} }
m_seExtents = {{fullThickness, fullThickness}, {fullThickness, fullThickness}}; m_seExtents = {{fullThickness, fullThickness}, {fullThickness, fullThickness}};
m_bLastRelativeBox = CBox{0, 0, m_vLastWindowSize.x, m_vLastWindowSize.y}.expand(**PBORDERSIZE).addExtents(m_seExtents); m_bLastRelativeBox = CBox{0, 0, m_vLastWindowSize.x, m_vLastWindowSize.y}.addExtents(m_seExtents);
if (fullThickness != m_fLastThickness) { if (fullThickness != m_fLastThickness) {
m_fLastThickness = fullThickness; m_fLastThickness = fullThickness;

1
borders-plus-plus/borderDeco.hpp
View file

@ -33,6 +33,7 @@ class CBordersPlusPlus : public IHyprWindowDecoration {
PHLWINDOWREF m_pWindow; PHLWINDOWREF m_pWindow;
CBox m_bLastRelativeBox; CBox m_bLastRelativeBox;
CBox m_bAssignedGeometry;
Vector2D m_vLastWindowPos; Vector2D m_vLastWindowPos;
Vector2D m_vLastWindowSize; Vector2D m_vLastWindowSize;