Add filter to list icons (closes #39)

Zerthox · Sep 4, 2024 · 946115e · 946115e
1 parent 29d44cb
commit 946115e
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/src/elements/element/kind.rs b/src/elements/element/kind.rs
@@ -87,6 +87,15 @@ impl RenderOptions for ElementType {
     }
 }
 
+impl ElementType {
+    pub fn render_filters(&mut self, ui: &Ui, state: &mut EditState) {
+        match self {
+            Self::IconList(list) => list.render_filters(ui, state),
+            Self::Group(_) | Self::Icon(_) | Self::Text(_) | Self::Bar(_) => {}
+        }
+    }
+}
+
 impl RenderDebug for ElementType {
     fn render_debug(&mut self, ui: &Ui) {
         match self {

diff --git a/src/elements/element/mod.rs b/src/elements/element/mod.rs
@@ -160,6 +160,7 @@ impl Element {
 
             if let Some(_token) = ui.tab_item("Filter") {
                 self.filter.render_options(ui, state);
+                self.kind.render_filters(ui, state);
             }
 
             if let Some(_token) = ui.tab_item("Animation") {

diff --git a/src/elements/list/action.rs b/src/elements/list/action.rs
@@ -57,11 +57,12 @@ impl IconAction {
             Self::Paste(index) => {
                 if let Some(Element {
                     common,
+                    filter,
                     kind: ElementType::Icon(element),
                     ..
                 }) = state.take_clipboard()
                 {
-                    children.insert(index, ListIcon::from_element(common, element));
+                    children.insert(index, ListIcon::from_element(common, element, filter));
                 } else {
                     panic!("icon action paste without icon element");
                 }

diff --git a/src/elements/list/icon.rs b/src/elements/list/icon.rs
@@ -3,8 +3,7 @@ use crate::{
     elements::{Common, Element, ElementType, Icon, IconElement, RenderState},
     render::{RenderDebug, RenderOptions},
     render_util::Rect,
-    traits::{RenderDebug, RenderOptions},
-    trigger::ProgressTrigger,
+    trigger::{FilterTrigger, ProgressTrigger, Trigger},
 };
 use nexus::imgui::Ui;
 use serde::{Deserialize, Serialize};
@@ -20,6 +19,8 @@ pub struct ListIcon {
     #[serde(alias = "progress_active")]
     pub trigger: ProgressTrigger,
 
+    pub filter: FilterTrigger,
+
     #[serde(flatten)]
     pub icon: Icon,
 }
@@ -28,7 +29,7 @@ impl ListIcon {
     pub fn is_visible(&mut self, ctx: &Context, state: &RenderState) -> bool {
         let parent = state.common.trigger.active();
         self.trigger.update(ctx, state.is_edit(ctx), parent);
-        self.enabled && self.trigger.active().is_some()
+        self.enabled && self.trigger.active().is_some() && self.filter.is_active(ctx)
     }
 
     pub fn render(&mut self, ui: &Ui, ctx: &Context, state: &RenderState, size: [f32; 2]) {
@@ -52,15 +53,17 @@ impl ListIcon {
                 icon: self.icon,
                 size,
             }),
+            filter: self.filter,
             ..Element::default()
         }
     }
 
-    pub fn from_element(common: Common, element: IconElement) -> Self {
+    pub fn from_element(common: Common, element: IconElement, filter: FilterTrigger) -> Self {
         Self {
             enabled: common.enabled,
             name: common.name,
             trigger: common.trigger,
+            filter,
             icon: element.icon,
         }
     }
@@ -93,6 +96,7 @@ impl Default for ListIcon {
             enabled: true,
             name: "Unnamed".into(),
             trigger: ProgressTrigger::effect(),
+            filter: FilterTrigger::default(),
             icon: Icon::default(),
         }
     }

diff --git a/src/elements/list/mod.rs b/src/elements/list/mod.rs
@@ -195,17 +195,19 @@ impl RenderOptions for IconList {
                 }
             }
         }
+    }
+}
 
-        if let Some(_token) = ui.tab_item("Filter") {
-            ui.spacing();
-            for (i, icon) in self.icons.iter_mut().enumerate() {
-                let _id = ui.push_id(i as i32);
-                let open = CollapsingHeader::new(format!("{}###icon{i}", icon.name))
-                    .flags(TreeNodeFlags::ALLOW_ITEM_OVERLAP)
-                    .begin(ui);
-                if open {
-                    icon.filter.render_options(ui, state);
-                }
+impl IconList {
+    pub fn render_filters(&mut self, ui: &Ui, state: &mut EditState) {
+        ui.spacing();
+        for (i, icon) in self.icons.iter_mut().enumerate() {
+            let _id = ui.push_id(i as i32);
+            let open = CollapsingHeader::new(format!("{}###icon{i}", icon.name))
+                .flags(TreeNodeFlags::ALLOW_ITEM_OVERLAP)
+                .begin(ui);
+            if open {
+                icon.filter.render_options(ui, state);
             }
         }
     }