kdheepak/taskwarrior-tui
1
0
Fork 0
mirror of https://github.com/kdheepak/taskwarrior-tui.git synced 2025-08-23 20:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: Use set_cursor_position instead of set_cursor

Browse source
This commit is contained in:
a-kenji 2025-05-28 22:58:04 +02:00
parent 626c6cd4e9
commit 82502bcbdc
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/app.rs
View file

@ -22,14 +22,7 @@ use futures::SinkExt;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use log::{debug, error, info, log_enabled, trace, warn, Level, LevelFilter}; use log::{debug, error, info, log_enabled, trace, warn, Level, LevelFilter};
use ratatui::{ use ratatui::{
backend::{Backend, CrosstermBackend}, backend::{Backend, CrosstermBackend}, layout::{Alignment, Constraint, Direction, Layout, Margin, Position, Rect}, style::{Color, Modifier, Style}, symbols::bar::FULL, text::{Line, Span, Text}, widgets::{Block, BorderType, Borders, Clear, Gauge, LineGauge, List, ListItem, Paragraph, Tabs, Wrap}, Frame, Terminal
layout::{Alignment, Constraint, Direction, Layout, Margin, Rect},
style::{Color, Modifier, Style},
symbols::bar::FULL,
Frame,
text::{Line, Span, Text},
widgets::{Block, BorderType, Borders, Clear, Gauge, LineGauge, List, ListItem, Paragraph, Tabs, Wrap},
Terminal,
}; };
use regex::Regex; use regex::Regex;
use rustyline::{history::SearchDirection as HistoryDirection, line_buffer::LineBuffer, At, Editor, Word}; use rustyline::{history::SearchDirection as HistoryDirection, line_buffer::LineBuffer, At, Editor, Word};
@ -1018,7 +1011,8 @@ impl TaskwarriorTui {
fn draw_command(&self, f: &mut Frame, rect: Rect, text: &str, title: (Span, Option<Span>), position: usize, cursor: bool, error: Option<String>) { fn draw_command(&self, f: &mut Frame, rect: Rect, text: &str, title: (Span, Option<Span>), position: usize, cursor: bool, error: Option<String>) {
// f.render_widget(Clear, rect); // f.render_widget(Clear, rect);
if cursor { if cursor {
f.set_cursor(std::cmp::min(rect.x + position as u16, rect.x + rect.width.saturating_sub(2)), rect.y + 1); let position = Position::new(std::cmp::min(rect.x + position as u16, rect.x + rect.width.saturating_sub(2)), rect.y + 1);
f.set_cursor_position(position);
} }
let rects = Layout::default() let rects = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)
@ -3823,7 +3817,7 @@ mod tests {
path::{Path, PathBuf}, path::{Path, PathBuf},
}; };
use ratatui::{backend::TestBackend, buffer::Buffer}; use ratatui::{backend::TestBackend, buffer::Buffer, prelude::Position};
use super::*; use super::*;
@ -4407,13 +4401,14 @@ mod tests {
let rects = Layout::default() let rects = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)
.constraints([Constraint::Min(0), Constraint::Length(3)].as_ref()) .constraints([Constraint::Min(0), Constraint::Length(3)].as_ref())
.split(f.size()); .split(f.area());
let position = TaskwarriorTui::get_position(&app.modify); let taskwarror_position = TaskwarriorTui::get_position(&app.modify);
f.set_cursor( let position = Position::new(
std::cmp::min(rects[1].x + position as u16, rects[1].x + rects[1].width.saturating_sub(2)), std::cmp::min(rects[1].x + taskwarror_position as u16, rects[1].x + rects[1].width.saturating_sub(2)),
rects[1].y + 1, rects[1].y + 1,
); );
f.set_cursor_position(position);
f.render_widget(Clear, rects[1]); f.render_widget(Clear, rects[1]);
let selected = app.current_selection; let selected = app.current_selection;
let task_ids = if app.tasks.is_empty() { let task_ids = if app.tasks.is_empty() {
@ -4444,7 +4439,7 @@ mod tests {
rects[1], rects[1],
app.modify.as_str(), app.modify.as_str(),
(Span::styled(label, Style::default().add_modifier(Modifier::BOLD)), None), (Span::styled(label, Style::default().add_modifier(Modifier::BOLD)), None),
position, taskwarror_position,
true, true,
app.error.clone(), app.error.clone(),
); );
@ -4461,13 +4456,11 @@ mod tests {
let rects = Layout::default() let rects = Layout::default()
.direction(Direction::Vertical) .direction(Direction::Vertical)
.constraints([Constraint::Min(0), Constraint::Length(3)].as_ref()) .constraints([Constraint::Min(0), Constraint::Length(3)].as_ref())
.split(f.size()); .split(f.area());
let position = TaskwarriorTui::get_position(&app.modify); let taskwarrior_position = TaskwarriorTui::get_position(&app.modify);
f.set_cursor( let position = Position::new(std::cmp::min(rects[1].x + taskwarrior_position as u16, rects[1].x + rects[1].width.saturating_sub(2)), rects[1].y + 1);
std::cmp::min(rects[1].x + position as u16, rects[1].x + rects[1].width.saturating_sub(2)), f.set_cursor_position(position);
rects[1].y + 1,
);
f.render_widget(Clear, rects[1]); f.render_widget(Clear, rects[1]);
let selected = app.current_selection; let selected = app.current_selection;
let task_ids = if app.tasks.is_empty() { let task_ids = if app.tasks.is_empty() {
@ -4498,7 +4491,7 @@ mod tests {
rects[1], rects[1],
app.modify.as_str(), app.modify.as_str(),
(Span::styled(label, Style::default().add_modifier(Modifier::BOLD)), None), (Span::styled(label, Style::default().add_modifier(Modifier::BOLD)), None),
position, taskwarrior_position,
true, true,
app.error.clone(), app.error.clone(),
); );