final touches on objects

src/chamber.rs

@@ -97,6 +97,7 @@ impl Chamber {
                             to: v.pos.into(),
                             color: color,
                             width: WALL_WIDTH,
+                            dashed: false,
                         })];
                     } else if self.first_vert == None {
                         // special case: placement of first vertex

src/door.rs

@@ -68,12 +68,14 @@ impl Door {
                     from: world_pos - (self.width / 2.0) * tangent,
                     to: world_pos + (self.width / 2.0) * tangent,
                     width: 10.0,
+                    dashed: false,
                 }),
                 Box::new(Line {
                     color: color,
                     from: world_pos - (self.width / 4.0) * tangent,
                     to: world_pos + (self.width / 4.0) * tangent,
                     width: 20.0,
+                    dashed: false,
                 }),
             ]
         } else {
@@ -82,6 +84,7 @@ impl Door {
                 from: world_pos - (self.width / 2.0) * tangent,
                 to: world_pos + (self.width / 2.0) * tangent,
                 width: 20.0,
+                dashed: false,
             })]
         }
     }

src/object.rs

@@ -85,6 +85,7 @@ impl Object {
             // draw x in box
             Box::new(Line {
                 color: color,
+                dashed: self.hidden,
                 from: Vec2 {
                     x: self.pos.x as f64,
                     y: self.pos.y as f64,
@@ -97,6 +98,7 @@ impl Object {
             }),
             Box::new(Line {
                 color: color,
+                dashed: self.hidden,
                 from: Vec2 {
                     x: (self.pos.x + GRID_SIZE) as f64,
                     y: self.pos.y as f64,

src/view/canvas.rs

@@ -153,6 +153,7 @@ impl Canvas {
                             b: 0.0,
                         },
                         width: 3.0,
+                        dashed: false,
                     }
                     .draw(ctx),
                 }
@@ -324,13 +325,15 @@ impl Canvas {
                                 b: 0.0,
                             };
                             Line {
+                                dashed: false,
                                 from: w1.p1.into(),
                                 to: w1.p2.into(),
                                 color: color,
                                 width: 3.0,
                             }
                             .draw(ctx);
                             Line {
+                                dashed: false,
                                 from: w2.p1.into(),
                                 to: w2.p2.into(),
                                 color: color,

src/view/entity_tabs.rs

@@ -41,9 +41,15 @@ impl StateEventSubscriber for EntityTabs {
             StateEvent::ActiveDoorChanged(Some(_)) => {
                 self.widget.set_current_page(Some(2));
             }
+            StateEvent::ActiveObjectChanged(Some(_)) => {
+                self.widget.set_current_page(Some(3));
+            }
             StateEvent::DoorAdded(_) => {
                 self.widget.set_current_page(Some(2));
             }
+            StateEvent::ObjectAdded(_) => {
+                self.widget.set_current_page(Some(3));
+            }
             _ => {}
         };
         vec![]

src/view/grid.rs

@@ -55,6 +55,7 @@ impl Grid {
                 },
                 color: self.color,
                 width: self.width,
+                dashed: false,
             });
             lines.push(line);
         }
@@ -70,6 +71,7 @@ impl Grid {
                 },
                 color: self.color,
                 width: self.width,
+                dashed: false,
             });
             lines.push(line);
         }

src/view/object_edit.rs

@@ -2,14 +2,10 @@ use std::cell::RefCell;
 use std::rc::Rc;
 
 use gtk::glib::clone;
-use gtk::{
-    gio, glib, CheckButton, DropDown, Expression, ListItem, PolicyType, ScrolledWindow,
-    SignalListItemFactory,
-};
+use gtk::{gio, CheckButton, ListItem, PolicyType, ScrolledWindow, SignalListItemFactory};
 use gtk::{prelude::*, Label, TextView};
 use gtk::{Box, Entry};
 
-use crate::chamber::ChamberId;
 use crate::state::events::StateEvent;
 use crate::state::{StateCommand, StateController, StateEventSubscriber};
 

src/view/primitives.rs

@@ -17,6 +17,7 @@ pub struct Line {
     pub to: Vec2<f64>,
     pub color: Rgb,
     pub width: f64,
+    pub dashed: bool,
 }
 
 pub struct Polygon {
@@ -58,6 +59,11 @@ impl Primitive for Point {
 
 impl Primitive for Line {
     fn draw(&self, ctx: &gtk::cairo::Context) {
+        if self.dashed {
+            ctx.set_dash(&vec![20.0, 10.0], 0.0);
+        } else {
+            ctx.set_dash(&vec![], 0.0);
+        }
         ctx.set_line_width(self.width);
         ctx.set_source_rgb(self.color.r, self.color.g, self.color.b);
         ctx.move_to(self.from.x, self.from.y);