mirror/hyprland-plugins
3
0
Fork 0
mirror of https://github.com/hyprwm/hyprland-plugins.git synced 2025-10-29 19:58:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

expo: improve closing gesture

Browse Source
This commit is contained in:
vaxerski 2025-09-13 00:59:41 +01:00
parent c1d5db968c
commit 27e1ad9042
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hyprexpo/ExpoGesture.cpp
View File

@ -13,6 +13,10 @@ void CExpoGesture::begin(const ITrackpadGesture::STrackpadGestureBegin& e) {
if (!g_pOverview)
g_pOverview = std::make_unique<COverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
else {
g_pOverview->selectHoveredWorkspace();
g_pOverview->setClosing(true);
}
}
void CExpoGesture::update(const ITrackpadGesture::STrackpadGestureUpdate& e) {
@ -30,5 +34,7 @@ void CExpoGesture::update(const ITrackpadGesture::STrackpadGestureUpdate& e) {
}
void CExpoGesture::end(const ITrackpadGesture::STrackpadGestureEnd& e) {
g_pOverview->setClosing(false);
g_pOverview->onSwipeEnd();
g_pOverview->resetSwipe();
}

25
hyprexpo/overview.cpp
View File

@ -184,7 +184,7 @@ COverview::COverview(PHLWORKSPACE startedOn_, bool swipe_) : startedOn(startedOn
PMONITOR->m_activeSpecialWorkspace = openSpecial;
PMONITOR->m_activeWorkspace = startedOn;
startedOn->m_visible = true;
startedOn->m_visible = true;
g_pDesktopAnimationManager->startAnimation(startedOn, CDesktopAnimationManager::ANIMATION_TYPE_IN, true, true);
// zoom on the current workspace.
@ -225,11 +225,7 @@ COverview::COverview(PHLWORKSPACE startedOn_, bool swipe_) : startedOn(startedOn
info.cancelled = true;
// get tile x,y
int x = lastMousePosLocal.x / pMonitor->m_size.x * SIDE_LENGTH;
int y = lastMousePosLocal.y / pMonitor->m_size.y * SIDE_LENGTH;
closeOnID = x + y * SIDE_LENGTH;
selectHoveredWorkspace();
close();
};
@ -316,7 +312,7 @@ void COverview::redrawID(int id, bool forcelowres) {
pMonitor->m_activeSpecialWorkspace = openSpecial;
pMonitor->m_activeWorkspace = startedOn;
startedOn->m_visible = true;
startedOn->m_visible = true;
g_pDesktopAnimationManager->startAnimation(startedOn, CDesktopAnimationManager::ANIMATION_TYPE_IN, true, true);
blockOverviewRendering = false;
@ -460,6 +456,14 @@ static Vector2D lerp(const Vector2D& from, const Vector2D& to, const float perc)
return Vector2D{lerp(from.x, to.x, perc), lerp(from.y, to.y, perc)};
}
void COverview::setClosing(bool closing_) {
closing = closing_;
}
void COverview::resetSwipe() {
swipeWasCommenced = false;
}
void COverview::onSwipeUpdate(double delta) {
m_isSwiping = true;
@ -468,13 +472,14 @@ void COverview::onSwipeUpdate(double delta) {
static auto* const* PDISTANCE = (Hyprlang::INT* const*)HyprlandAPI::getConfigValue(PHANDLE, "plugin:hyprexpo:gesture_distance")->getDataStaticPtr();
const float PERC = 1.0 - std::clamp(delta / (double)**PDISTANCE, 0.0, 1.0);
const float PERC = closing ? std::clamp(delta / (double)**PDISTANCE, 0.0, 1.0) : 1.0 - std::clamp(delta / (double)**PDISTANCE, 0.0, 1.0);
const auto WORKSPACE_FOCUS_ID = closing && closeOnID != -1 ? closeOnID : openedID;
Vector2D tileSize = (pMonitor->m_size / SIDE_LENGTH);
const auto SIZEMAX = pMonitor->m_size * pMonitor->m_size / tileSize;
const auto POSMAX =
(-((pMonitor->m_size / (double)SIDE_LENGTH) * Vector2D{openedID % SIDE_LENGTH, openedID / SIDE_LENGTH}) * pMonitor->m_scale) * (pMonitor->m_size / tileSize);
const auto POSMAX = (-((pMonitor->m_size / (double)SIDE_LENGTH) * Vector2D{WORKSPACE_FOCUS_ID % SIDE_LENGTH, WORKSPACE_FOCUS_ID / SIDE_LENGTH}) * pMonitor->m_scale) *
(pMonitor->m_size / tileSize);
const auto SIZEMIN = pMonitor->m_size;
const auto POSMIN = Vector2D{0, 0};

3
hyprexpo/overview.hpp
View File

@ -25,6 +25,9 @@ class COverview {
void onDamageReported();
void onPreRender();
void setClosing(bool closing);
void resetSwipe();
void onSwipeUpdate(double delta);
void onSwipeEnd();