Skip to content

Horizontal scroll with a shift pressed in a spreadsheet view #10

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.

Sign up for GitHub

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

Merged
dimspell merged 4 commits into from
May 17, 2026
Merged

Horizontal scroll with a shift pressed in a spreadsheet view #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f9efb0
Press shift to scroll horizontally in the spreadsheet view
dimspell May 17, 2026
2b7c171
App-level shift state detection instead of widget level
dimspell May 17, 2026
65f70b7
Actual fix to the horizontal scroll on mouse wheel (not trackpad)
dimspell May 17, 2026
ae4fe29
Revert "App-level shift state detection instead of widget level"
dimspell May 17, 2026
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
3 changes: 3 additions & 0 deletions dispel-gui/src/view/editor/table_widget/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ pub(crate) struct State {
/// cached `viewport_height` stays fresh — programmatic scroll-to math
/// (arrow nav, highlight jumps) depends on it.
pub(crate) last_body_height: Option<f32>,
/// Shift modifier state — held while scrolling redirects vertical wheel
/// delta to horizontal scroll.
pub(crate) shift_pressed: bool,
}

/// Sub-region of a header cell. Used for hit-testing clicks and for hover
Expand Down
21 changes: 16 additions & 5 deletions dispel-gui/src/view/editor/table_widget/widget_trait_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,22 @@ impl<Message, Theme> Widget<Message, Theme, iced::Renderer> for TableWidget<'_,
}
let (dx, dy) = match delta {
mouse::ScrollDelta::Lines { x, y } => {
(-x * self.row_height, -y * self.row_height)
(-x * self.row_height * 3.0, -y * self.row_height * 3.0)
}
mouse::ScrollDelta::Pixels { x, y } => (-x, -y),
};
let new_x = state.scroll_offset.x + dx;
let new_y = state.scroll_offset.y + dy;
if self.apply_scroll(state, bounds, new_x, new_y, shell) {
shell.capture_event();
if state.shift_pressed {
let horiz = if dx != 0.0 { dx } else { dy };
let new_x = state.scroll_offset.x + horiz;
if self.apply_scroll(state, bounds, new_x, state.scroll_offset.y, shell) {
shell.capture_event();
}
} else {
let new_x = state.scroll_offset.x + dx;
let new_y = state.scroll_offset.y + dy;
if self.apply_scroll(state, bounds, new_x, new_y, shell) {
shell.capture_event();
}
}
}
Event::Mouse(mouse::Event::CursorMoved { .. }) => {
Expand Down Expand Up @@ -239,6 +247,9 @@ impl<Message, Theme> Widget<Message, Theme, iced::Renderer> for TableWidget<'_,
shell.capture_event();
shell.request_redraw();
}
Event::Keyboard(keyboard::Event::ModifiersChanged(modifiers)) => {
state.shift_pressed = modifiers.shift();
}
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Right)) => {
let Some(p) = cursor.position_over(bounds) else {
return;
Expand Down