first pass of merging in warp (doesn't build)

app/src/chip_configurator/mod.rs

@@ -9,7 +9,8 @@ pub(crate) use modal_shell::{
     render_chip_editor_modal, render_chip_editor_sections, ChipEditorModalConfig,
     ChipEditorMouseHandles, ChipEditorSectionsConfig,
 };
-
+use pathfinder_geometry::rect::RectF;
+use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::elements::{
     Border, ConstrainedBox, Container, CrossAxisAlignment, Dash, DispatchEventResult, Draggable,
@@ -20,15 +21,12 @@ use galaxyui::fonts::Properties;
 use galaxyui::platform::Cursor;
 use galaxyui::ui_components::components::UiComponent;
 use galaxyui::{Action, View, ViewContext};
-use pathfinder_geometry::rect::RectF;
-use pathfinder_geometry::vector::vec2f;
 
 use crate::ai::blocklist::agent_view::toolbar_item::AgentToolbarItemKind;
 use crate::appearance::Appearance;
 use crate::context_chips::display_chip::{chip_container, udi_font_size};
 use crate::context_chips::renderer::{ChipDragState, Renderer as ContextChipRenderer};
-use crate::context_chips::spacing;
-use crate::context_chips::{ChipAvailability, ContextChipKind};
+use crate::context_chips::{spacing, ChipAvailability, ContextChipKind};
 use crate::ui_components::icons;
 
 const USED_CHIPS_POSITION_ID: &str = "chip_cfg_used";
@@ -329,7 +327,7 @@ pub struct CurrentDraggingState {
     pub current_location: ChipLocation,
 }
 
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum ChipConfiguratorAction {
     StartDraggingChip { location: ChipLocation },
     DragChip { current_position: RectF },
@@ -422,6 +420,15 @@ impl ChipConfigurator {
         self.current_dragging_state = None;
     }
 
+    /// Whether any zone currently holds chips (i.e. the configurator is open /
+    /// populated).
+    pub fn has_items(&self) -> bool {
+        !self.used_chips.is_empty()
+            || !self.left_chips.is_empty()
+            || !self.right_chips.is_empty()
+            || !self.unused_chips.is_empty()
+    }
+
     pub fn left_item_kinds(&self) -> Vec<AgentToolbarItemKind> {
         self.left_chips
             .iter()