cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

algo/scrolling: adjust focus callbacks to be more intuitive

Browse source
This commit is contained in:
Vaxry 2026-02-24 12:27:00 +00:00
parent be893a81b4
commit fbf67ef050
No known key found for this signature in database
GPG key ID: 665806380871D640
4 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/layout/algorithm/tiled/scrolling/ScrollTapeController.cpp
View file

@ -241,7 +241,7 @@ void CScrollTapeController::fitStrip(size_t stripIndex, const CBox& usableArea,
m_offset = std::clamp(m_offset, stripStart - usablePrimary + stripSize, stripStart); m_offset = std::clamp(m_offset, stripStart - usablePrimary + stripSize, stripStart);
} }
bool CScrollTapeController::isStripVisible(size_t stripIndex, const CBox& usableArea, bool fullscreenOnOne) const { bool CScrollTapeController::isStripVisible(size_t stripIndex, const CBox& usableArea, bool fullscreenOnOne, bool full) const {
if (stripIndex >= m_strips.size()) if (stripIndex >= m_strips.size())
return false; return false;
@ -250,7 +250,10 @@ bool CScrollTapeController::isStripVisible(size_t stripIndex, const CBox& usable
const double viewStart = m_offset; const double viewStart = m_offset;
const double viewEnd = m_offset + getPrimary(usableArea.size()); const double viewEnd = m_offset + getPrimary(usableArea.size());
return stripStart < viewEnd && viewStart < stripEnd; if (!full)
return stripStart < viewEnd && viewStart < stripEnd;
else
return stripStart >= viewStart && stripEnd <= viewEnd;
} }
size_t CScrollTapeController::getStripAtCenter(const CBox& usableArea, bool fullscreenOnOne) const { size_t CScrollTapeController::getStripAtCenter(const CBox& usableArea, bool fullscreenOnOne) const {

2
src/layout/algorithm/tiled/scrolling/ScrollTapeController.hpp
View file

@ -63,7 +63,7 @@ namespace Layout::Tiled {
void centerStrip(size_t stripIndex, const CBox& usableArea, bool fullscreenOnOne = false); void centerStrip(size_t stripIndex, const CBox& usableArea, bool fullscreenOnOne = false);
void fitStrip(size_t stripIndex, const CBox& usableArea, bool fullscreenOnOne = false); void fitStrip(size_t stripIndex, const CBox& usableArea, bool fullscreenOnOne = false);
bool isStripVisible(size_t stripIndex, const CBox& usableArea, bool fullscreenOnOne = false) const; bool isStripVisible(size_t stripIndex, const CBox& usableArea, bool fullscreenOnOne = false, bool full = false) const;
size_t getStripAtCenter(const CBox& usableArea, bool fullscreenOnOne = false) const; size_t getStripAtCenter(const CBox& usableArea, bool fullscreenOnOne = false) const;

32
src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp
View file

@ -448,13 +448,13 @@ double SScrollingData::maxWidth() {
return controller->calculateMaxExtent(USABLE, *PFSONONE); return controller->calculateMaxExtent(USABLE, *PFSONONE);
} }
bool SScrollingData::visible(SP<SColumnData> c) { bool SScrollingData::visible(SP<SColumnData> c, bool full) {
static const auto PFSONONE = CConfigValue<Hyprlang::INT>("scrolling:fullscreen_on_one_column"); static const auto PFSONONE = CConfigValue<Hyprlang::INT>("scrolling:fullscreen_on_one_column");
const auto USABLE = algorithm->usableArea(); const auto USABLE = algorithm->usableArea();
int64_t colIdx = idx(c); int64_t colIdx = idx(c);
if (colIdx >= 0) if (colIdx >= 0)
return controller->isStripVisible(colIdx, USABLE, *PFSONONE); return controller->isStripVisible(colIdx, USABLE, *PFSONONE, full);
return false; return false;
} }
@ -497,8 +497,10 @@ CScrollingAlgorithm::CScrollingAlgorithm() {
}); });
m_mouseButtonCallback = Event::bus()->m_events.input.mouse.button.listen([this](IPointer::SButtonEvent e, Event::SCallbackInfo&) { m_mouseButtonCallback = Event::bus()->m_events.input.mouse.button.listen([this](IPointer::SButtonEvent e, Event::SCallbackInfo&) {
if (e.state == WL_POINTER_BUTTON_STATE_RELEASED && Desktop::focusState()->window()) static const auto PFOLLOW_FOCUS = CConfigValue<Hyprlang::INT>("scrolling:follow_focus");
focusOnInput(Desktop::focusState()->window()->layoutTarget(), true);
if (*PFOLLOW_FOCUS && e.state == WL_POINTER_BUTTON_STATE_RELEASED && Desktop::focusState()->window())
focusOnInput(Desktop::focusState()->window()->layoutTarget(), INPUT_MODE_CLICK);
}); });
m_focusCallback = Event::bus()->m_events.window.active.listen([this](PHLWINDOW pWindow, Desktop::eFocusReason reason) { m_focusCallback = Event::bus()->m_events.window.active.listen([this](PHLWINDOW pWindow, Desktop::eFocusReason reason) {
@ -517,7 +519,7 @@ CScrollingAlgorithm::CScrollingAlgorithm() {
if (!TARGET || TARGET->floating()) if (!TARGET || TARGET->floating())
return; return;
focusOnInput(TARGET, Desktop::isHardInputFocusReason(reason)); focusOnInput(TARGET, reason == Desktop::FOCUS_REASON_CLICK ? INPUT_MODE_CLICK : (Desktop::isHardInputFocusReason(reason) ? INPUT_MODE_KB : INPUT_MODE_SOFT));
}); });
// Initialize default widths and direction // Initialize default widths and direction
@ -530,7 +532,7 @@ CScrollingAlgorithm::~CScrollingAlgorithm() {
m_focusCallback.reset(); m_focusCallback.reset();
} }
void CScrollingAlgorithm::focusOnInput(SP<ITarget> target, bool hardInput) { void CScrollingAlgorithm::focusOnInput(SP<ITarget> target, eInputMode input) {
static const auto PFOLLOW_FOCUS_MIN_PERC = CConfigValue<Hyprlang::FLOAT>("scrolling:follow_min_visible"); static const auto PFOLLOW_FOCUS_MIN_PERC = CConfigValue<Hyprlang::FLOAT>("scrolling:follow_min_visible");
if (!target || target->space() != m_parent->space()) if (!target || target->space() != m_parent->space())
@ -540,7 +542,7 @@ void CScrollingAlgorithm::focusOnInput(SP<ITarget> target, bool hardInput) {
if (!TARGETDATA) if (!TARGETDATA)
return; return;
if (*PFOLLOW_FOCUS_MIN_PERC > 0.F && !hardInput) { if (*PFOLLOW_FOCUS_MIN_PERC > 0.F && input == INPUT_MODE_SOFT) {
// check how much of the window is visible, unless hard input focus // check how much of the window is visible, unless hard input focus
const auto IS_HORIZ = m_scrollingData->controller->isPrimaryHorizontal(); const auto IS_HORIZ = m_scrollingData->controller->isPrimaryHorizontal();
@ -557,8 +559,12 @@ void CScrollingAlgorithm::focusOnInput(SP<ITarget> target, bool hardInput) {
return; return;
} }
// if we moved via non-kb, and it's fully visible, ignore
if (m_scrollingData->visible(TARGETDATA->column.lock(), true) && input != INPUT_MODE_KB)
return;
static const auto PFITMETHOD = CConfigValue<Hyprlang::INT>("scrolling:focus_fit_method"); static const auto PFITMETHOD = CConfigValue<Hyprlang::INT>("scrolling:focus_fit_method");
if (*PFITMETHOD == 1) if (*PFITMETHOD == 1 || input == INPUT_MODE_CLICK)
m_scrollingData->fitCol(TARGETDATA->column.lock()); m_scrollingData->fitCol(TARGETDATA->column.lock());
else else
m_scrollingData->centerCol(TARGETDATA->column.lock()); m_scrollingData->centerCol(TARGETDATA->column.lock());
@ -770,8 +776,14 @@ void CScrollingAlgorithm::resizeTarget(const Vector2D& delta, SP<ITarget> target
} }
void CScrollingAlgorithm::recalculate() { void CScrollingAlgorithm::recalculate() {
if (Desktop::focusState()->window()) if (Desktop::focusState()->window()) {
focusOnInput(Desktop::focusState()->window()->layoutTarget(), true); const auto TARGET = Desktop::focusState()->window()->layoutTarget();
const auto TARGETDATA = dataFor(TARGET);
if (TARGETDATA && !m_scrollingData->visible(TARGETDATA->column.lock(), true))
focusOnInput(Desktop::focusState()->window()->layoutTarget(), INPUT_MODE_KB);
}
m_scrollingData->recalculate(); m_scrollingData->recalculate();
} }

10
src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.hpp
View file

@ -77,7 +77,7 @@ namespace Layout::Tiled {
SP<SColumnData> prev(SP<SColumnData> c); SP<SColumnData> prev(SP<SColumnData> c);
SP<SColumnData> atCenter(); SP<SColumnData> atCenter();
bool visible(SP<SColumnData> c); bool visible(SP<SColumnData> c, bool full = false);
void centerCol(SP<SColumnData> c); void centerCol(SP<SColumnData> c);
void fitCol(SP<SColumnData> c); void fitCol(SP<SColumnData> c);
void centerOrFitCol(SP<SColumnData> c); void centerOrFitCol(SP<SColumnData> c);
@ -111,6 +111,12 @@ namespace Layout::Tiled {
CBox usableArea(); CBox usableArea();
enum eInputMode : uint8_t {
INPUT_MODE_SOFT = 0,
INPUT_MODE_CLICK,
INPUT_MODE_KB
};
private: private:
SP<SScrollingData> m_scrollingData; SP<SScrollingData> m_scrollingData;
@ -130,7 +136,7 @@ namespace Layout::Tiled {
void focusTargetUpdate(SP<ITarget> target); void focusTargetUpdate(SP<ITarget> target);
void moveTargetTo(SP<ITarget> t, Math::eDirection dir, bool silent); void moveTargetTo(SP<ITarget> t, Math::eDirection dir, bool silent);
void focusOnInput(SP<ITarget> target, bool hardInput); void focusOnInput(SP<ITarget> target, eInputMode input);
friend struct SScrollingData; friend struct SScrollingData;
}; };