zesterer/zte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added scroll bar

Browse source
This commit is contained in:
Joshua Barretto 2025-09-24 16:51:01 +01:00
parent af403b9099
commit 3862c66538
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lang/mod.rs
View file

@ -183,7 +183,7 @@ impl Highlighter {
pub fn generic_clike(self) -> Self {
self
// Keywords
.with(TokenKind::Keyword, r"\b[(var)(enum)(let)(this)(fn)(struct)(class)(import)(if)(while)(for)(in)(loop)(else)(break)(continue)(const)(static)(type)(extern)(return)(async)(throw)(catch)(union)(auto)(namespace)(public)(private)(function)(func)(goto)(case)(default)(switch)]\b")
.with(TokenKind::Keyword, r"\b[(var)(enum)(let)(this)(fn)(struct)(class)(import)(if)(while)(for)(in)(loop)(else)(break)(continue)(const)(static)(type)(extern)(return)(async)(throw)(catch)(union)(auto)(namespace)(public)(private)(function)(func)(goto)(case)(default)(switch)(typedef)]\b")
// Primitives
.with(TokenKind::Type, r"\b[(([(unsigned)(signed)][[:space:]])*u?int[0-9]*(_t)?)(float)(double)(bool)(char)(size_t)(void)]\b")
.clike_comments()

24
src/ui/input.rs
View file

@ -214,11 +214,11 @@ impl Input {
buffer: &Buffer,
cursor_id: CursorId,
finder: Option<&Finder>,
frame: &mut Rect,
outer_frame: &mut Rect,
) {
// Add frame
let mut frame = frame.with_border(
if frame.has_focus() {
let mut frame = outer_frame.with_border(
if outer_frame.has_focus() {
&state.theme.focus_border
} else {
&state.theme.border
@ -337,5 +337,23 @@ impl Input {
pos += line.len();
}
// TODO: Clean this up
let line_count = buffer.text.lines().count();
let frame_sz = outer_frame.size()[1].saturating_sub(2).max(1);
let scroll_sz = (frame_sz * frame_sz / line_count).max(1).min(frame_sz);
if scroll_sz != frame_sz {
let lines2 = line_count.saturating_sub(frame_sz).max(1);
let offset = frame_sz.saturating_sub(scroll_sz)
* (self.focus[1].max(0) as usize).min(lines2)
/ lines2;
outer_frame
.rect(
[outer_frame.size()[0].saturating_sub(1), 1 + offset],
[1, scroll_sz],
)
.with_bg(Color::White)
.fill(' ');
}
}
}