Remove flex_1 from bottom dock to fix pane group spacing

Nate Butler created 2 years ago

Change summary

crates/workspace2/src/pane.rs       | 12 +++++-------
crates/workspace2/src/workspace2.rs | 17 ++---------------
2 files changed, 7 insertions(+), 22 deletions(-)

Detailed changes

crates/workspace2/src/pane.rs

@@ -24,6 +24,7 @@ use std::{
         Arc,
     },
 };
+use theme2::default_color_scales;
 use ui::v_stack;
 use ui::{prelude::*, Icon, IconButton, IconElement, TextColor, Tooltip};
 use util::truncate_and_remove_front;
@@ -1480,15 +1481,10 @@ impl Pane {
             // Right Side
             .child(
                 div()
-                    // We only use absolute here since we don't
-                    // have opacity or `hidden()` yet
-                    .absolute()
-                    .neg_top_7()
                     .px_1()
                     .flex()
                     .flex_none()
                     .gap_2()
-                    .group_hover("tab_bar", |this| this.top_0())
                     // Nav Buttons
                     .child(
                         div()
@@ -1931,9 +1927,11 @@ impl Render for Pane {
                     .map(|task| task.detach_and_log_err(cx));
             })
             .child(self.render_tab_bar(cx))
-            .child(div() /* todo!(toolbar) */)
+            // .child(
+            //     div()
+            // ) /* todo!(toolbar) */
             .child(if let Some(item) = self.active_item() {
-                div().flex_1().child(item.to_any())
+                div().flex().flex_1().child(item.to_any())
             } else {
                 // todo!()
                 div().child("Empty Pane")

crates/workspace2/src/workspace2.rs

@@ -63,7 +63,7 @@ use std::{
     sync::{atomic::AtomicUsize, Arc},
     time::Duration,
 };
-use theme2::{ActiveTheme, ThemeSettings};
+use theme2::{default_color_scales, ActiveTheme, ThemeSettings};
 pub use toolbar::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView};
 pub use ui;
 use util::ResultExt;
@@ -3666,7 +3666,7 @@ impl Render for Workspace {
                                         &self.app_state,
                                         cx,
                                     ))
-                                    .child(div().flex().flex_1().child(self.bottom_dock.clone())),
+                                    .child(self.bottom_dock.clone()),
                             )
                             // Right Dock
                             .child(
@@ -3679,19 +3679,6 @@ impl Render for Workspace {
                     ),
             )
             .child(self.status_bar.clone())
-            .z_index(8)
-            // Debug
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .z_index(9)
-                    .absolute()
-                    .top_20()
-                    .left_1_4()
-                    .w_40()
-                    .gap_2(),
-            )
     }
 }