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

input: Fix scroll to offset to support soft wrap mode. (#1671)

Browse source 
Close #1655

https://github.com/user-attachments/assets/ea7032d0-d15a-4127-9b0b-b035e2c835fe
This commit is contained in:
Jason Lee 2025-11-24 17:14:39 +08:00 committed by GitHub
parent bdc5ce4b6e
commit 8144085077
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,11 +4,11 @@
//! https://github.com/zed-industries/zed/blob/main/crates/gpui/examples/input.rs //! https://github.com/zed-industries/zed/blob/main/crates/gpui/examples/input.rs
use anyhow::Result; use anyhow::Result;
use gpui::{ use gpui::{
actions, div, point, prelude::FluentBuilder as _, px, Action, App, AppContext, Bounds, Action, App, AppContext, Bounds, ClipboardItem, Context, Entity, EntityInputHandler,
ClipboardItem, Context, Entity, EntityInputHandler, EventEmitter, FocusHandle, Focusable, EventEmitter, FocusHandle, Focusable, InteractiveElement as _, IntoElement, KeyBinding,
InteractiveElement as _, IntoElement, KeyBinding, KeyDownEvent, MouseButton, MouseDownEvent, KeyDownEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, ParentElement as _,
MouseMoveEvent, MouseUpEvent, ParentElement as _, Pixels, Point, Render, ScrollHandle, Pixels, Point, Render, ScrollHandle, ScrollWheelEvent, SharedString, Styled as _, Subscription,
ScrollWheelEvent, SharedString, Styled as _, Subscription, Task, UTF16Selection, Window, Task, UTF16Selection, Window, actions, div, point, prelude::FluentBuilder as _, px,
}; };
use ropey::{Rope, RopeSlice}; use ropey::{Rope, RopeSlice};
use serde::Deserialize; use serde::Deserialize;
@ -19,20 +19,20 @@ use sum_tree::Bias;
use unicode_segmentation::*; use unicode_segmentation::*;
use super::{ use super::{
blink_cursor::BlinkCursor, change::Change, element::TextElement, mask_pattern::MaskPattern, TabSize, blink_cursor::BlinkCursor, change::Change, element::TextElement,
mode::InputMode, number_input, text_wrapper::TextWrapper, TabSize, mask_pattern::MaskPattern, mode::InputMode, number_input, text_wrapper::TextWrapper,
}; };
use crate::actions::{SelectDown, SelectLeft, SelectRight, SelectUp}; use crate::actions::{SelectDown, SelectLeft, SelectRight, SelectUp};
use crate::input::{ use crate::input::{
HoverDefinition, Lsp, Position,
element::RIGHT_MARGIN, element::RIGHT_MARGIN,
popovers::{ContextMenu, DiagnosticPopover, HoverPopover, MouseContextMenu}, popovers::{ContextMenu, DiagnosticPopover, HoverPopover, MouseContextMenu},
search::{self, SearchPanel}, search::{self, SearchPanel},
text_wrapper::LineLayout, text_wrapper::LineLayout,
HoverDefinition, Lsp, Position,
}; };
use crate::input::{RopeExt as _, Selection}; use crate::input::{RopeExt as _, Selection};
use crate::{Root, history::History, scroll::ScrollbarState};
use crate::{highlighter::DiagnosticSet, input::text_wrapper::LineItem}; use crate::{highlighter::DiagnosticSet, input::text_wrapper::LineItem};
use crate::{history::History, scroll::ScrollbarState, Root};
#[derive(Action, Clone, PartialEq, Eq, Deserialize)] #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
#[action(namespace = input, no_json)] #[action(namespace = input, no_json)]
@ -1343,6 +1343,7 @@ impl InputState {
let line_height = last_layout.line_height; let line_height = last_layout.line_height;
let point = self.text.offset_to_point(offset); let point = self.text.offset_to_point(offset);
let row = point.row; let row = point.row;
let mut row_offset_y = px(0.); let mut row_offset_y = px(0.);
@ -1358,10 +1359,11 @@ impl InputState {
.lines .lines
.get(row.saturating_sub(last_layout.visible_range.start)) .get(row.saturating_sub(last_layout.visible_range.start))
{ {
// Check to scroll horizontally // Check to scroll horizontally and soft wrap lines
if let Some(pos) = line.position_for_index(point.column, line_height) { if let Some(pos) = line.position_for_index(point.column, line_height) {
let bounds_width = bounds.size.width - last_layout.line_number_width; let bounds_width = bounds.size.width - last_layout.line_number_width;
let col_offset_x = pos.x; let col_offset_x = pos.x;
row_offset_y += pos.y;
if col_offset_x - RIGHT_MARGIN < -scroll_offset.x { if col_offset_x - RIGHT_MARGIN < -scroll_offset.x {
// If the position is out of the visible area, scroll to make it visible // If the position is out of the visible area, scroll to make it visible
scroll_offset.x = -col_offset_x + RIGHT_MARGIN; scroll_offset.x = -col_offset_x + RIGHT_MARGIN;