Skip to content

Hide the Scrollbar when it isn't needed #507 #520

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

Open
deemoun wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Hide the Scrollbar when it isn't needed #507 #520

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39cf201
Scrollbar is now hidden when it's not necessary #507
deemoun Feb 8, 2026
9e6e6c8
Additional fixes for the scrollbar behavior
deemoun Feb 8, 2026
abdc75c
Revert some behavior back
deemoun Feb 8, 2026
e6e45ca
Fixing the scrollbar behaviour after testing
deemoun Feb 8, 2026
089bfc3
Merge branch 'master' into hide-scrollbar
leviport Feb 11, 2026
11da61b
Merge branch 'master' into hide-scrollbar
deemoun Feb 14, 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
73 changes: 43 additions & 30 deletions src/text_box.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,9 @@ where
let mut start_line_opt = None;
let mut end_line = 0;
let mut max_line_width = 0.0;
let mut layout_run_count = 0usize;
for run in buffer.layout_runs() {
layout_run_count += 1;
end_line = run.line_i;
if start_line_opt.is_none() {
start_line_opt = Some(end_line);
Expand All @@ -594,14 +596,24 @@ where
let start_y = (start_line * image_h as usize) / lines;
let end_y = ((end_line + 1) * image_h as usize) / lines;

let rect = Rectangle::new(
[image_w as f32 / scale_factor, start_y as f32 / scale_factor].into(),
Size::new(
scrollbar_size as f32,
(end_y as f32 - start_y as f32) / scale_factor,
),
);
state.scrollbar_v_rect.set(rect);
let original_condition = start_line > 0 || (end_line + 1) < lines;
let visible_runs = (((image_h as f32 / scale_factor) / metrics.line_height)
.floor() as usize)
.max(1);
let wrap_overflow = layout_run_count > visible_runs;
let scrollable = original_condition || wrap_overflow;
if scrollable {
let rect = Rectangle::new(
[image_w as f32 / scale_factor, start_y as f32 / scale_factor].into(),
Size::new(
scrollbar_size as f32,
(end_y as f32 - start_y as f32) / scale_factor,
),
);
state.scrollbar_v_rect.set(Some(rect));
} else {
state.scrollbar_v_rect.set(None);
}

let (buffer_w_opt, buffer_h_opt) = buffer.size();
let buffer_w = buffer_w_opt.unwrap_or(0.0);
Expand Down Expand Up @@ -723,8 +735,7 @@ where
});

// Draw vertical scrollbar
{
let scrollbar_v_rect = state.scrollbar_v_rect.get();
if let Some(scrollbar_v_rect) = state.scrollbar_v_rect.get() {

// neutral_3, 0.7
let track_color = cosmic_theme
Expand Down Expand Up @@ -1158,27 +1169,29 @@ where
}
state.click = Some((click_kind, Instant::now()));
state.dragging = Some(Dragging::Buffer);
} else if scrollbar_v_rect.contains(Point::new(x_logical, y_logical)) {
state.dragging = Some(Dragging::ScrollbarV {
start_y: y,
start_scroll: editor.with_buffer(|buffer| buffer.scroll()),
});
} else if x_logical >= scrollbar_v_rect.x
&& x_logical < (scrollbar_v_rect.x + scrollbar_v_rect.width)
{
editor.with_buffer_mut(|buffer| {
let mut scroll = buffer.scroll();
//TODO: if buffer height is undefined, what should this do?
let scroll_line = ((y / buffer.size().1.unwrap_or(1.0))
* buffer.lines.len() as f32)
as i32;
scroll.line = scroll_line.try_into().unwrap_or_default();
buffer.set_scroll(scroll);
} else if let Some(scrollbar_v_rect) = scrollbar_v_rect {
if scrollbar_v_rect.contains(Point::new(x_logical, y_logical)) {
state.dragging = Some(Dragging::ScrollbarV {
start_y: y,
start_scroll: buffer.scroll(),
start_scroll: editor.with_buffer(|buffer| buffer.scroll()),
});
});
} else if x_logical >= scrollbar_v_rect.x
&& x_logical < (scrollbar_v_rect.x + scrollbar_v_rect.width)
{
editor.with_buffer_mut(|buffer| {
let mut scroll = buffer.scroll();
//TODO: if buffer height is undefined, what should this do?
let scroll_line = ((y / buffer.size().1.unwrap_or(1.0))
* buffer.lines.len() as f32)
as i32;
scroll.line = scroll_line.try_into().unwrap_or_default();
buffer.set_scroll(scroll);
state.dragging = Some(Dragging::ScrollbarV {
start_y: y,
start_scroll: buffer.scroll(),
});
});
}
}
}

Expand Down Expand Up @@ -1358,7 +1371,7 @@ pub struct State {
is_focused: bool,
emit_focus: bool,
scale_factor: Cell<f32>,
scrollbar_v_rect: Cell<Rectangle<f32>>,
scrollbar_v_rect: Cell<Option<Rectangle<f32>>>,
scrollbar_h_rect: Cell<Option<Rectangle<f32>>>,
handle_opt: Mutex<Option<image::Handle>>,
shift_anchor: Mutex<Option<Cursor>>,
Expand All @@ -1375,7 +1388,7 @@ impl State {
is_focused: false,
emit_focus: false,
scale_factor: Cell::new(1.0),
scrollbar_v_rect: Cell::new(Rectangle::default()),
scrollbar_v_rect: Cell::new(None),
scrollbar_h_rect: Cell::new(None),
handle_opt: Mutex::new(None),
shift_anchor: Mutex::new(None),
Expand Down