Skip to content

Commit f97cb48

Browse files
authored
Merge pull request #24 from randlee/feature/fix-terminal-prompt-env-vars
fix: terminal pane layout - ensure proper height propagation
2 parents f13b1f9 + 8e1349c commit f97cb48

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

src/ui/workspace.rs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ impl WorkspaceView {
574574
div()
575575
.flex()
576576
.flex_1()
577-
.w_full()
577+
.size_full()
578578
.relative()
579579
.child(
580580
div()
@@ -606,6 +606,7 @@ impl WorkspaceView {
606606
d.child(
607607
div()
608608
.flex_basis(relative(visible_ratios[0]))
609+
.h_full()
609610
.child(self.render_pane(PaneType::FileBrowser, cx)),
610611
)
611612
})
@@ -618,6 +619,7 @@ impl WorkspaceView {
618619
d.child(
619620
div()
620621
.flex_basis(relative(visible_ratios[1]))
622+
.h_full()
621623
.child(self.render_pane(PaneType::Terminal, cx)),
622624
)
623625
})
@@ -630,6 +632,7 @@ impl WorkspaceView {
630632
d.child(
631633
div()
632634
.flex_basis(relative(visible_ratios[2]))
635+
.h_full()
633636
.child(self.render_pane(PaneType::DocumentViewer, cx)),
634637
)
635638
})
@@ -655,13 +658,12 @@ impl WorkspaceView {
655658
// Terminal pane renders the actual TerminalPane component
656659
if pane_type == PaneType::Terminal {
657660
return div()
658-
.flex_1()
661+
.size_full()
659662
.flex()
660663
.flex_col()
661664
.m_2()
662665
.bg(theme.colors().panel_background)
663666
.rounded_md()
664-
.overflow_hidden()
665667
.child(
666668
div()
667669
.flex()
@@ -680,7 +682,14 @@ impl WorkspaceView {
680682
)
681683
.child(self.render_hide_button(pane_type, cx)),
682684
)
683-
.child(self.terminal_pane.clone());
685+
.child(
686+
div()
687+
.flex_1()
688+
.size_full()
689+
.min_h_0()
690+
.overflow_hidden()
691+
.child(self.terminal_pane.clone()),
692+
);
684693
}
685694

686695
// Document viewer renders placeholder

0 commit comments

Comments
 (0)