diff --git a/src/editor/main.rs b/src/editor/main.rs index b31baafb..015f1432 100644 --- a/src/editor/main.rs +++ b/src/editor/main.rs @@ -762,6 +762,7 @@ impl EditorScene { } }); + let context_popup_id = im_str!("context"); if !ui.io().want_capture_mouse { if ui.is_mouse_clicked(MouseButton::Left) { if let Some(env) = self.environment.as_ref() { @@ -780,7 +781,7 @@ impl EditorScene { if ui.is_mouse_clicked(MouseButton::Right) { if let Some(tile) = self.target_tile { self.context_tile = Some(tile); - ui.open_popup(im_str!("context")); + ui.open_popup(context_popup_id); } } @@ -795,7 +796,7 @@ impl EditorScene { if let Some((x, y)) = self.context_tile { let mut open = false; - ui.popup(im_str!("context"), || { + ui.popup(context_popup_id, || { open = true; if let Some(map) = self.maps.get_mut(self.map_current) { diff --git a/src/editor/tools/place.rs b/src/editor/tools/place.rs index 3e5ebae8..fbf51ba1 100644 --- a/src/editor/tools/place.rs +++ b/src/editor/tools/place.rs @@ -29,6 +29,8 @@ impl ToolBehavior for Place { let mut i = 0; let Place { palette, pal_current } = self; + let add_popup_id = im_str!("place_tool_add"); + let count = ui.fits_width(34.0); palette.retain_mut(|pal| { if i % count != 0 { @@ -92,13 +94,13 @@ impl ToolBehavior for Place { ui.same_line(0.0); } if ui.button(im_str!("+"), [34.0, 34.0]) { - ui.open_popup(im_str!("place_tool_add")); + ui.open_popup(add_popup_id); } if ui.is_item_hovered() { ui.tooltip_text(im_str!("Add")); } - ui.popup(im_str!("place_tool_add"), || { + ui.popup(add_popup_id, || { let mut selection = None; ui.objtree_menu(env, &mut selection); if let Some(sel) = selection {