Skip to content

Commit 95bbbda

Browse files
committed
ratatui update
1 parent 72b954a commit 95bbbda

File tree

11 files changed

+39
-25
lines changed

11 files changed

+39
-25
lines changed

Cargo.lock

Lines changed: 21 additions & 11 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
@@ -32,14 +32,14 @@ filetreelist = { path = "./filetreelist", version = "0.5" }
3232
fuzzy-matcher = "0.3"
3333
gh-emoji = { version = "1.0", optional = true }
3434
indexmap = "2"
35-
itertools = "0.12"
35+
itertools = "0.13"
3636
log = "0.4"
3737
notify = "6.1"
3838
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.26", default-features = false, features = [
42+
ratatui = { version = "0.27", 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.4.0"
60+
tui-textarea = "0.5"
6161
two-face = { version = "0.4.0", default-features = false }
6262
unicode-segmentation = "1.11"
6363
unicode-truncate = "1.0"

deny.toml

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

2323
[bans]
2424
multiple-versions = "deny"
25-
skip-tree = [{ name = "windows-sys" }, { name = "bitflags" }]
25+
skip-tree = [
26+
{ name = "windows-sys" },
27+
{ name = "bitflags" },
28+
{ name = "itertools" },
29+
]

src/app.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ impl App {
10741074
const SIDE_PADS: usize = 2;
10751075
const MARGIN_LEFT_AND_RIGHT: usize = 2;
10761076

1077-
let r = r.inner(&Margin {
1077+
let r = r.inner(Margin {
10781078
vertical: 0,
10791079
horizontal: 1,
10801080
});

src/popups/branchlist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl DrawableComponent for BranchListPopup {
8080
area,
8181
);
8282

83-
let area = area.inner(&Margin {
83+
let area = area.inner(Margin {
8484
vertical: 1,
8585
horizontal: 1,
8686
});

src/popups/fuzzy_find.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ impl DrawableComponent for FuzzyFindPopup {
293293
]
294294
.as_ref(),
295295
)
296-
.split(area.inner(&Margin {
296+
.split(area.inner(Margin {
297297
horizontal: 1,
298298
vertical: 1,
299299
}));

src/popups/help.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl HelpPopup {
208208
let mut processed = 0_u16;
209209

210210
for (key, group) in
211-
&self.cmds.iter().group_by(|e| e.text.group)
211+
&self.cmds.iter().chunk_by(|e| e.text.group)
212212
{
213213
txt.push(Line::from(Span::styled(
214214
Cow::from(key.to_string()),

src/popups/log_search.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ impl LogSearchPopupPopup {
377377
[Constraint::Length(1), Constraint::Percentage(100)]
378378
.as_ref(),
379379
)
380-
.split(area.inner(&Margin {
380+
.split(area.inner(Margin {
381381
horizontal: 1,
382382
vertical: 1,
383383
}));
@@ -430,7 +430,7 @@ impl LogSearchPopupPopup {
430430
let chunks = Layout::default()
431431
.direction(Direction::Vertical)
432432
.constraints([Constraint::Length(1)].as_ref())
433-
.split(area.inner(&Margin {
433+
.split(area.inner(Margin {
434434
horizontal: 1,
435435
vertical: 1,
436436
}));

src/popups/submodules.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl DrawableComponent for SubmodulesListPopup {
6767
area,
6868
);
6969

70-
let area = area.inner(&Margin {
70+
let area = area.inner(Margin {
7171
vertical: 1,
7272
horizontal: 1,
7373
});

src/popups/taglist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl DrawableComponent for TagListPopup {
111111
f.render_widget(Clear, area);
112112
f.render_stateful_widget(table, area, &mut table_state);
113113

114-
let area = area.inner(&Margin {
114+
let area = area.inner(Margin {
115115
vertical: 1,
116116
horizontal: 0,
117117
});

src/ui/scrollbar.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ impl Scrollbar {
5252
};
5353

5454
let (bar_top, bar_height) = {
55-
let scrollbar_area = area.inner(&Margin {
55+
let scrollbar_area = area.inner(Margin {
5656
horizontal: 0,
5757
vertical: 1,
5858
});
@@ -89,7 +89,7 @@ impl Scrollbar {
8989
};
9090

9191
let (bar_left, bar_width) = {
92-
let scrollbar_area = area.inner(&Margin {
92+
let scrollbar_area = area.inner(Margin {
9393
horizontal: 1,
9494
vertical: 0,
9595
});

0 commit comments

Comments
 (0)