Merge remote-tracking branch 'origin/main' into HEAD

src/app/view/mod.rs

@@ -1435,13 +1435,23 @@ impl OpenCADStudio {
         // Selection-cycling list box: pick among overlapping objects.
         if let Some((pt, cands)) = &self.cycle_candidates {
             if !tab.is_start {
-                let items: Vec<(acadrust::Handle, String)> = cands
+                let items: Vec<crate::ui::popup::cycle_popup::CycleCandidate> = cands
                     .iter()
                     .filter_map(|&h| {
-                        tab.scene
-                            .document
-                            .get_entity(h)
-                            .map(|e| (h, crate::entities::traits::entity_type_name(e).to_string()))
+                        tab.scene.document.get_entity(h).map(|e| {
+                            let style = crate::scene::view::render::render_style_for_viewport(
+                                &tab.scene.document,
+                                e,
+                                None,
+                            );
+                            crate::ui::popup::cycle_popup::CycleCandidate {
+                                handle: h,
+                                type_name: crate::entities::traits::entity_type_name(e)
+                                    .to_string(),
+                                layer: e.common().layer.clone(),
+                                color: style.0,
+                            }
+                        })
                     })
                     .collect();
                 if !items.is_empty() {