hyprwm/hyprland-plugins
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprland-plugins.git synced 2024-11-22 02:35:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

hyprbars: minor drag fixes

Browse source
This commit is contained in:
vaxerski 2023-03-16 16:00:59 +00:00
parent 21c277c2f2
commit 3b44ce9725
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
hyprbars/barDeco.cpp
View file

@ -40,7 +40,15 @@ void CHyprBar::onMouseDown(wlr_pointer_button_event* e) {
if (m_pWindow != g_pCompositor->m_pLastWindow) if (m_pWindow != g_pCompositor->m_pLastWindow)
return; return;
const auto COORDS = cursorRelativeToBar(); const auto COORDS = cursorRelativeToBar();
static auto* const PHEIGHT = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:hyprbars:bar_height")->intValue;
if (!VECINRECT(COORDS, 0, 0, m_vLastWindowSize.x, *PHEIGHT)) {
m_bDraggingThis = false;
m_bDragPending = false;
return;
}
if (e->state != WLR_BUTTON_PRESSED) { if (e->state != WLR_BUTTON_PRESSED) {
if (m_bDraggingThis) { if (m_bDraggingThis) {
@ -55,7 +63,6 @@ void CHyprBar::onMouseDown(wlr_pointer_button_event* e) {
// check if on a button // check if on a button
static auto* const PBORDERSIZE = &HyprlandAPI::getConfigValue(PHANDLE, "general:border_size")->intValue; static auto* const PBORDERSIZE = &HyprlandAPI::getConfigValue(PHANDLE, "general:border_size")->intValue;
static auto* const PHEIGHT = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:hyprbars:bar_height")->intValue;
const auto BARBUF = Vector2D{(int)m_vLastWindowSize.x + 2 * *PBORDERSIZE, *PHEIGHT}; const auto BARBUF = Vector2D{(int)m_vLastWindowSize.x + 2 * *PBORDERSIZE, *PHEIGHT};
Vector2D currentPos = Vector2D{BARBUF.x - BUTTONS_PAD - BUTTONS_SIZE, BARBUF.y / 2.0 - BUTTONS_SIZE / 2.0}.floor(); Vector2D currentPos = Vector2D{BARBUF.x - BUTTONS_PAD - BUTTONS_SIZE, BARBUF.y / 2.0 - BUTTONS_SIZE / 2.0}.floor();
currentPos.y -= BUTTONS_PAD / 2.0; currentPos.y -= BUTTONS_PAD / 2.0;
@ -76,13 +83,7 @@ void CHyprBar::onMouseDown(wlr_pointer_button_event* e) {
return; return;
} }
// if we call da dispatcher here the handler later will remove our mouse bind m_bDragPending = true;
if (VECINRECT(COORDS, 0, 0, m_vLastWindowSize.x, *PHEIGHT))
m_bDragPending = true;
else {
m_bDraggingThis = false;
m_bDragPending = false;
}
} }
void CHyprBar::onMouseMove(Vector2D coords) { void CHyprBar::onMouseMove(Vector2D coords) {