Skip to content

Commit b5d527b

Browse files
extrawurstextrawurst
committed
update crossterm and ratatui
1 parent 3a86cb5 commit b5d527b

18 files changed

+83
-71
lines changed

‎Cargo.lock

Lines changed: 45 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bytesize = { version = "1.3", default-features = false }
2525
chrono = { version = "0.4", default-features = false, features = ["clock"] }
2626
clap = { version = "4.5", features = ["env", "cargo"] }
2727
crossbeam-channel = "0.5"
28-
crossterm = { version = "0.27", features = ["serde"] }
28+
crossterm = { version = "0.28", features = ["serde"] }
2929
dirs = "5.0"
3030
easy-cast = "0.5"
3131
filetreelist = { path = "./filetreelist", version = "0.5" }
@@ -39,7 +39,7 @@ notify-debouncer-mini = "0.4"
3939
once_cell = "1"
4040
# pin until upgrading this does not introduce a duplicte dependency
4141
parking_lot_core = "=0.9.9"
42-
ratatui = { version = "0.27", default-features = false, features = [
42+
ratatui = { version = "0.28", default-features = false, features = [
4343
'crossterm',
4444
'serde',
4545
] }
@@ -57,7 +57,7 @@ syntect = { version = "5.2", default-features = false, features = [
5757
"default-themes",
5858
"html",
5959
] }
60-
tui-textarea = "0.5"
60+
tui-textarea = "0.6"
6161
two-face = { version = "0.4.0", default-features = false }
6262
unicode-segmentation = "1.11"
6363
unicode-truncate = "1.0"

‎deny.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ version = "1.0.3"
2222

2323
[bans]
2424
multiple-versions = "deny"
25-
skip-tree = [{ name = "windows-sys" }, { name = "bitflags" }]
25+
skip-tree = [{ name = "windows-sys" }, { name = "bitflags" }, { name = "mio" }]

‎src/app.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ impl App {
227227

228228
///
229229
pub fn draw(&self, f: &mut Frame) -> Result<()> {
230-
let fsize = f.size();
230+
let fsize = f.area();
231231

232232
self.cmdbar.borrow_mut().refresh_width(fsize.width);
233233

‎src/components/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ macro_rules! draw_popups {
8282
]
8383
.as_ref(),
8484
)
85-
.split(f.size())[0];
85+
.split(f.area())[0];
8686

8787
($($self.$element.draw(&mut f, size)?) , +);
8888

‎src/components/textinput.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -623,18 +623,18 @@ impl DrawableComponent for TextInputComponent {
623623
let area = if self.embed {
624624
rect
625625
} else if self.input_type == InputType::Multiline {
626-
let area = ui::centered_rect(60, 20, f.size());
626+
let area = ui::centered_rect(60, 20, f.area());
627627
ui::rect_inside(
628628
Size::new(10, 3),
629-
f.size().into(),
629+
f.area().into(),
630630
area,
631631
)
632632
} else {
633-
let area = ui::centered_rect(60, 1, f.size());
633+
let area = ui::centered_rect(60, 1, f.area());
634634

635635
ui::rect_inside(
636636
Size::new(10, 3),
637-
Size::new(f.size().width, 3),
637+
Size::new(f.area().width, 3),
638638
area,
639639
)
640640
};

‎src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ fn shutdown_terminal() {
302302

303303
fn draw(terminal: &mut Terminal, app: &App) -> io::Result<()> {
304304
if app.requires_redraw() {
305-
terminal.resize(terminal.size()?)?;
305+
terminal.clear()?;
306306
}
307307

308308
terminal.draw(|f| {

‎src/popups/branchlist.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ impl DrawableComponent for BranchListPopup {
6464
let area = ui::centered_rect(
6565
PERCENT_SIZE.width,
6666
PERCENT_SIZE.height,
67-
f.size(),
67+
f.area(),
6868
);
6969
let area =
70-
ui::rect_inside(MIN_SIZE, f.size().into(), area);
70+
ui::rect_inside(MIN_SIZE, f.area().into(), area);
7171
let area = area.intersection(rect);
7272

7373
f.render_widget(Clear, area);

‎src/popups/confirm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl DrawableComponent for ConfirmPopup {
3535
self.theme.text_danger(),
3636
);
3737

38-
let area = ui::centered_rect(50, 20, f.size());
38+
let area = ui::centered_rect(50, 20, f.area());
3939
f.render_widget(Clear, area);
4040
f.render_widget(
4141
popup_paragraph(&title, txt, &self.theme, true, true),

‎src/popups/externaleditor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl DrawableComponent for ExternalEditorPopup {
131131
.collect::<Vec<Span>>(),
132132
);
133133

134-
let area = ui::centered_rect_absolute(25, 3, f.size());
134+
let area = ui::centered_rect_absolute(25, 3, f.area());
135135
f.render_widget(Clear, area);
136136
f.render_widget(
137137
Paragraph::new(txt)

‎src/popups/fetch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl DrawableComponent for FetchPopup {
119119
if self.visible {
120120
let progress = self.progress.unwrap_or_default().progress;
121121

122-
let area = ui::centered_rect_absolute(30, 3, f.size());
122+
let area = ui::centered_rect_absolute(30, 3, f.area());
123123

124124
f.render_widget(Clear, area);
125125
f.render_widget(

‎src/popups/help.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl DrawableComponent for HelpPopup {
3939
self.selection.saturating_sub(scroll_threshold);
4040

4141
let area =
42-
ui::centered_rect_absolute(SIZE.0, SIZE.1, f.size());
42+
ui::centered_rect_absolute(SIZE.0, SIZE.1, f.area());
4343

4444
f.render_widget(Clear, area);
4545
f.render_widget(

‎src/popups/msg.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl DrawableComponent for MsgPopup {
3838
return Ok(());
3939
}
4040

41-
let max_width = f.size().width.max(MINIMUM_WIDTH);
41+
let max_width = f.area().width.max(MINIMUM_WIDTH);
4242

4343
// determine the maximum width of text block
4444
let width = self
@@ -53,7 +53,7 @@ impl DrawableComponent for MsgPopup {
5353
.expect("can't fail because we're clamping to u16 value");
5454

5555
let area =
56-
ui::centered_rect_absolute(width, POPUP_HEIGHT, f.size());
56+
ui::centered_rect_absolute(width, POPUP_HEIGHT, f.area());
5757

5858
// Wrap lines and break words if there is not enough space
5959
let wrapped_msg = bwrap::wrap_maybrk!(
@@ -67,7 +67,7 @@ impl DrawableComponent for MsgPopup {
6767

6868
let height = POPUP_HEIGHT
6969
.saturating_sub(BORDER_WIDTH)
70-
.min(f.size().height.saturating_sub(BORDER_WIDTH));
70+
.min(f.area().height.saturating_sub(BORDER_WIDTH));
7171

7272
let top =
7373
self.scroll.update_no_selection(line_num, height.into());

‎src/popups/pull.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ impl DrawableComponent for PullPopup {
205205
let (state, progress) =
206206
PushPopup::get_progress(&self.progress);
207207

208-
let area = ui::centered_rect_absolute(30, 3, f.size());
208+
let area = ui::centered_rect_absolute(30, 3, f.area());
209209

210210
f.render_widget(Clear, area);
211211
f.render_widget(

‎src/popups/push.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl DrawableComponent for PushPopup {
234234
let (state, progress) =
235235
Self::get_progress(&self.progress);
236236

237-
let area = ui::centered_rect_absolute(30, 3, f.size());
237+
let area = ui::centered_rect_absolute(30, 3, f.area());
238238

239239
f.render_widget(Clear, area);
240240
f.render_widget(

‎src/popups/push_tags.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ impl DrawableComponent for PushTagsPopup {
162162
let (state, progress) =
163163
Self::get_progress(&self.progress);
164164

165-
let area = ui::centered_rect_absolute(30, 3, f.size());
165+
let area = ui::centered_rect_absolute(30, 3, f.area());
166166

167167
f.render_widget(Clear, area);
168168
f.render_widget(

‎src/popups/taglist.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ impl DrawableComponent for TagListPopup {
6262
let area = ui::centered_rect(
6363
PERCENT_SIZE.width,
6464
PERCENT_SIZE.height,
65-
f.size(),
65+
f.area(),
6666
);
6767
let area =
68-
ui::rect_inside(MIN_SIZE, f.size().into(), area);
68+
ui::rect_inside(MIN_SIZE, f.area().into(), area);
6969
let area = area.intersection(rect);
7070

7171
let tag_name_width =

0 commit comments

Comments
 (0)