From 83f9d51deea68e1605e125d1b1c44528475b86da Mon Sep 17 00:00:00 2001
From: Joseph Lyons <JosephTLyons@gmail.com>
Date: Wed, 8 Feb 2023 18:20:17 -0500
Subject: [PATCH] Fix layout of elements in the feedback editor's toolbar

Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
---
 crates/feedback/src/feedback_editor.rs |  6 ++-
 crates/gpui/src/elements.rs            | 10 +++-
 crates/gpui/src/elements/clipped.rs    | 69 ++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 crates/gpui/src/elements/clipped.rs

diff --git a/crates/feedback/src/feedback_editor.rs b/crates/feedback/src/feedback_editor.rs
index 4380b606d90ccc4330667c2c93aa7bbb9677461e..f950e6edd4055c18879a88c3d322caa7cb8e30f5 100644
--- a/crates/feedback/src/feedback_editor.rs
+++ b/crates/feedback/src/feedback_editor.rs
@@ -540,6 +540,8 @@ impl View for FeedbackInfoText {
         .contained()
         .with_style(theme.workspace.titlebar.outdated_warning.container)
         .aligned()
+        .left()
+        .clipped()
         .boxed()
     }
 }
@@ -554,7 +556,9 @@ impl ToolbarItemView for FeedbackInfoText {
         if let Some(feedback_editor) = active_pane_item.and_then(|i| i.downcast::<FeedbackEditor>())
         {
             self.active_item = Some(feedback_editor);
-            ToolbarItemLocation::PrimaryLeft { flex: None }
+            ToolbarItemLocation::PrimaryLeft {
+                flex: Some((1., false)),
+            }
         } else {
             self.active_item = None;
             ToolbarItemLocation::Hidden
diff --git a/crates/gpui/src/elements.rs b/crates/gpui/src/elements.rs
index 9f11f09f8e9e33ebcd414e15546419ad00317ffe..41a802feb37fcda12c8b68b76759f173b350a793 100644
--- a/crates/gpui/src/elements.rs
+++ b/crates/gpui/src/elements.rs
@@ -1,5 +1,6 @@
 mod align;
 mod canvas;
+mod clipped;
 mod constrained_box;
 mod container;
 mod empty;
@@ -19,12 +20,12 @@ mod text;
 mod tooltip;
 mod uniform_list;
 
-use self::expanded::Expanded;
 pub use self::{
     align::*, canvas::*, constrained_box::*, container::*, empty::*, flex::*, hook::*, image::*,
     keystroke_label::*, label::*, list::*, mouse_event_handler::*, overlay::*, resizable::*,
     stack::*, svg::*, text::*, tooltip::*, uniform_list::*,
 };
+use self::{clipped::Clipped, expanded::Expanded};
 pub use crate::presenter::ChildView;
 use crate::{
     geometry::{
@@ -135,6 +136,13 @@ pub trait Element {
         Align::new(self.boxed())
     }
 
+    fn clipped(self) -> Clipped
+    where
+        Self: 'static + Sized,
+    {
+        Clipped::new(self.boxed())
+    }
+
     fn contained(self) -> Container
     where
         Self: 'static + Sized,
diff --git a/crates/gpui/src/elements/clipped.rs b/crates/gpui/src/elements/clipped.rs
new file mode 100644
index 0000000000000000000000000000000000000000..2ee7b542a89ce32364c7a645ece634ccd96d3668
--- /dev/null
+++ b/crates/gpui/src/elements/clipped.rs
@@ -0,0 +1,69 @@
+use std::ops::Range;
+
+use pathfinder_geometry::{rect::RectF, vector::Vector2F};
+use serde_json::json;
+
+use crate::{
+    json, DebugContext, Element, ElementBox, LayoutContext, MeasurementContext, PaintContext,
+    SizeConstraint,
+};
+
+pub struct Clipped {
+    child: ElementBox,
+}
+
+impl Clipped {
+    pub fn new(child: ElementBox) -> Self {
+        Self { child }
+    }
+}
+
+impl Element for Clipped {
+    type LayoutState = ();
+    type PaintState = ();
+
+    fn layout(
+        &mut self,
+        constraint: SizeConstraint,
+        cx: &mut LayoutContext,
+    ) -> (Vector2F, Self::LayoutState) {
+        (self.child.layout(constraint, cx), ())
+    }
+
+    fn paint(
+        &mut self,
+        bounds: RectF,
+        visible_bounds: RectF,
+        _: &mut Self::LayoutState,
+        cx: &mut PaintContext,
+    ) -> Self::PaintState {
+        cx.scene.push_layer(Some(bounds));
+        self.child.paint(bounds.origin(), visible_bounds, cx);
+        cx.scene.pop_layer();
+    }
+
+    fn rect_for_text_range(
+        &self,
+        range_utf16: Range<usize>,
+        _: RectF,
+        _: RectF,
+        _: &Self::LayoutState,
+        _: &Self::PaintState,
+        cx: &MeasurementContext,
+    ) -> Option<RectF> {
+        self.child.rect_for_text_range(range_utf16, cx)
+    }
+
+    fn debug(
+        &self,
+        _: RectF,
+        _: &Self::LayoutState,
+        _: &Self::PaintState,
+        cx: &DebugContext,
+    ) -> json::Value {
+        json!({
+            "type": "Clipped",
+            "child": self.child.debug(cx)
+        })
+    }
+}