dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: Fix move cursor to scroll x to viewport. (#1285)

Browse source
This commit is contained in:
Jason Lee 2025-09-24 21:15:13 +08:00 committed by GitHub
parent 1c3eca93b8
commit 5aaf8c6a66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/ui/src/input/state.rs
View file

@ -30,6 +30,7 @@ use super::{
text_wrapper::TextWrapper, text_wrapper::TextWrapper,
}; };
use crate::input::{ use crate::input::{
element::RIGHT_MARGIN,
popovers::{ContextMenu, DiagnosticPopover, HoverPopover, MouseContextMenu}, popovers::{ContextMenu, DiagnosticPopover, HoverPopover, MouseContextMenu},
search::{self, SearchPanel}, search::{self, SearchPanel},
HoverDefinition, Lsp, Position, HoverDefinition, Lsp, Position,
@ -1673,6 +1674,23 @@ impl InputState {
row_offset_y += wrap_line.height(line_height); row_offset_y += wrap_line.height(line_height);
} }
if let Some(line) = last_layout
.lines
.get(row.saturating_sub(last_layout.visible_range.start))
{
// Check to scroll horizontally
if let Some(pos) = line.position_for_index(point.column, line_height) {
let bounds_width = bounds.size.width - last_layout.line_number_width;
let col_offset_x = pos.x;
if col_offset_x - RIGHT_MARGIN < -scroll_offset.x {
// If the position is out of the visible area, scroll to make it visible
scroll_offset.x = -col_offset_x + RIGHT_MARGIN;
} else if col_offset_x + RIGHT_MARGIN > -scroll_offset.x + bounds_width {
scroll_offset.x = -(col_offset_x - bounds_width + RIGHT_MARGIN);
}
}
}
// Check if row_offset_y is out of the viewport // Check if row_offset_y is out of the viewport
// If row offset is not in the viewport, scroll to make it visible // If row offset is not in the viewport, scroll to make it visible
let edge_height = 3 * line_height; let edge_height = 3 * line_height;