Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve TextEditor slow scrolling behavior with touchpads #2140

Merged
merged 4 commits into from
Feb 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Incorrect unit in `system::Information`. [#2223](https://github.com/iced-rs/iced/pull/2223)
- `size_hint` not being called from `element::Map`. [#2224](https://github.com/iced-rs/iced/pull/2224)
- `size_hint` not being called from `element::Explain`. [#2225](https://github.com/iced-rs/iced/pull/2225)
- Slow touch scrolling for `TextEditor` widget. [#2140](https://github.com/iced-rs/iced/pull/2140)

Many thanks to...

Expand All @@ -93,6 +94,7 @@ Many thanks to...
- @arslee07
- @AustinMReppert
- @avsaase
- @blazra
- @brianch
- @bungoboingo
- @Calastrophe
Expand Down
34 changes: 20 additions & 14 deletions widget/src/text_editor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ struct State<Highlighter: text::Highlighter> {
is_focused: bool,
last_click: Option<mouse::Click>,
drag_click: Option<mouse::click::Kind>,
partial_scroll: f32,
highlighter: RefCell<Highlighter>,
highlighter_settings: Highlighter::Settings,
highlighter_format_address: usize,
Expand All @@ -310,6 +311,7 @@ where
is_focused: false,
last_click: None,
drag_click: None,
partial_scroll: 0.0,
highlighter: RefCell::new(Highlighter::new(
&self.highlighter_settings,
)),
Expand Down Expand Up @@ -404,6 +406,14 @@ where

shell.publish(on_edit(action));
}
Update::Scroll(lines) => {
let lines = lines + state.partial_scroll;
state.partial_scroll = lines.fract();

shell.publish(on_edit(Action::Scroll {
lines: lines as i32,
}));
}
Update::Unfocus => {
state.is_focused = false;
state.drag_click = None;
Expand Down Expand Up @@ -577,6 +587,7 @@ where

enum Update {
Click(mouse::Click),
Scroll(f32),
Unfocus,
Release,
Action(Action),
Expand Down Expand Up @@ -630,21 +641,16 @@ impl Update {
mouse::Event::WheelScrolled { delta }
if cursor.is_over(bounds) =>
{
action(Action::Scroll {
lines: match delta {
mouse::ScrollDelta::Lines { y, .. } => {
if y.abs() > 0.0 {
(y.signum() * -(y.abs() * 4.0).max(1.0))
as i32
} else {
0
}
}
mouse::ScrollDelta::Pixels { y, .. } => {
(-y / 4.0) as i32
Some(Update::Scroll(match delta {
mouse::ScrollDelta::Lines { y, .. } => {
if y.abs() > 0.0 {
y.signum() * -(y.abs() * 4.0).max(1.0)
} else {
0.0
}
},
})
}
mouse::ScrollDelta::Pixels { y, .. } => -y / 4.0,
}))
}
_ => None,
},
Expand Down
Loading