Add shift modifier for multi selection

Author: TrueDoctor

editor/src/communication/dispatcher.rs

@@ -29,7 +29,6 @@ impl Dispatcher {
 				| Message::Frontend(FrontendMessage::UpdateCanvas { .. })
 				| Message::Frontend(FrontendMessage::SetCanvasZoom { .. })
 				| Message::Frontend(FrontendMessage::SetCanvasRotation { .. })
-				//| Message::Documents(DocumentsMessage::Document(DocumentMessage::DispatchOperation { .. }))
 		) || MessageDiscriminant::from(&message).local_name().ends_with("MouseMove"))
 		{
 			log::trace!("Message: {:?}", message);
@@ -151,7 +150,7 @@ mod test {
 		let document_before_copy = editor.dispatcher.documents_message_handler.active_document().document.clone();
 		let shape_id = document_before_copy.root.as_folder().unwrap().layer_ids[1];
 
-		editor.handle_message(DocumentMessage::SelectLayers(vec![vec![shape_id]])).unwrap();
+		editor.handle_message(DocumentMessage::SetSelectedLayers(vec![vec![shape_id]])).unwrap();
 		editor.handle_message(DocumentsMessage::CopySelectedLayers).unwrap();
 		editor.handle_message(DocumentsMessage::PasteLayers { path: vec![], insert_index: -1 }).unwrap();
 
@@ -211,7 +210,7 @@ mod test {
 			})
 			.unwrap();
 
-		editor.handle_message(DocumentMessage::SelectLayers(vec![vec![folder_id]])).unwrap();
+		editor.handle_message(DocumentMessage::SetSelectedLayers(vec![vec![folder_id]])).unwrap();
 
 		let document_before_copy = editor.dispatcher.documents_message_handler.active_document().document.clone();
 
@@ -275,7 +274,7 @@ mod test {
 		let rect_id = document_before_copy.root.as_folder().unwrap().layer_ids[RECT_INDEX];
 		let ellipse_id = document_before_copy.root.as_folder().unwrap().layer_ids[ELLIPSE_INDEX];
 
-		editor.handle_message(DocumentMessage::SelectLayers(vec![vec![rect_id], vec![ellipse_id]])).unwrap();
+		editor.handle_message(DocumentMessage::SetSelectedLayers(vec![vec![rect_id], vec![ellipse_id]])).unwrap();
 		editor.handle_message(DocumentsMessage::CopySelectedLayers).unwrap();
 		editor.handle_message(DocumentMessage::DeleteSelectedLayers).unwrap();
 		editor.draw_rect(0., 800., 12., 200.);
@@ -309,7 +308,7 @@ mod test {
 
 		let verify_order = |handler: &mut DocumentMessageHandler| (handler.all_layers_sorted(), handler.non_selected_layers_sorted(), handler.selected_layers_sorted());
 
-		editor.handle_message(DocumentMessage::SelectLayers(vec![vec![0], vec![2]])).unwrap();
+		editor.handle_message(DocumentMessage::SetSelectedLayers(vec![vec![0], vec![2]])).unwrap();
 
 		editor.handle_message(DocumentMessage::ReorderSelectedLayers(1)).unwrap();
 		let (all, non_selected, selected) = verify_order(&mut editor.dispatcher.documents_message_handler.active_document_mut());

editor/src/document/document_file.rs

@@ -66,7 +66,8 @@ pub enum DocumentMessage {
 	#[child]
 	Movement(MovementMessage),
 	DispatchOperation(Box<DocumentOperation>),
-	SelectLayers(Vec<Vec<LayerId>>),
+	SetSelectedLayers(Vec<Vec<LayerId>>),
+	AddSelectedLayers(Vec<Vec<LayerId>>),
 	SelectAllLayers,
 	SelectionChanged,
 	DeselectAllLayers,
@@ -138,10 +139,7 @@ impl DocumentMessageHandler {
 		self.layer_data(path).selected = true;
 		let data = self.layer_panel_entry(path.to_vec()).ok()?;
 		// TODO: Add deduplication
-		(!path.is_empty()).then(||FrontendMessage::UpdateLayer {
-			path: path.to_vec(),
-			data,
-		}.into())
+		(!path.is_empty()).then(|| FrontendMessage::UpdateLayer { path: path.to_vec(), data }.into())
 	}
 	pub fn selected_layers_bounding_box(&self) -> Option<[DVec2; 2]> {
 		let paths = self.selected_layers().map(|vec| &vec[..]);
@@ -365,8 +363,11 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 					responses.push_back(DocumentOperation::DuplicateLayer { path }.into())
 				}
 			}
-			SelectLayers(paths) => {
+			SetSelectedLayers(paths) => {
 				self.clear_selection();
+				responses.push_front(AddSelectedLayers(paths).into());
+			}
+			AddSelectedLayers(paths) => {
 				for path in paths {
 					responses.extend(self.select_layer(&path));
 				}
@@ -375,11 +376,16 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 				responses.push_back(SelectMessage::UpdateSelectionBoundingBox.into());
 			}
 			SelectAllLayers => {
-				let all_layer_paths = self.layer_data.keys().filter(|path| !path.is_empty() && !self.document.layer(path).unwrap().overlay ).cloned().collect::<Vec<_>>();
-				responses.push_back(SelectLayers(all_layer_paths).into());
+				let all_layer_paths = self
+					.layer_data
+					.keys()
+					.filter(|path| !path.is_empty() && !self.document.layer(path).unwrap().overlay)
+					.cloned()
+					.collect::<Vec<_>>();
+				responses.push_back(SetSelectedLayers(all_layer_paths).into());
 			}
 			DeselectAllLayers => {
-				responses.push_back(SelectLayers(vec![]).into());
+				responses.push_back(SetSelectedLayers(vec![]).into());
 			}
 			Undo => {
 				// this is a temporary fix and will be addressed by #123
@@ -408,7 +414,7 @@ impl MessageHandler<DocumentMessage, &InputPreprocessor> for DocumentMessageHand
 									}
 									.into(),
 								),
-								DocumentResponse::CreatedLayer { path } => (!self.document.layer(&path).unwrap().overlay).then(|| SelectLayers(vec![path]).into()),
+								DocumentResponse::CreatedLayer { path } => (!self.document.layer(&path).unwrap().overlay).then(|| SetSelectedLayers(vec![path]).into()),
 								DocumentResponse::DocumentChanged => unreachable!(),
 							})
 							.flatten(),

editor/src/input/input_mapper.rs

@@ -129,7 +129,7 @@ impl Default for Mapping {
 			entry! {action=MovementMessage::DisableSnapping, key_up=KeyShift},
 			// Select
 			entry! {action=SelectMessage::MouseMove, message=InputMapperMessage::PointerMove},
-			entry! {action=SelectMessage::DragStart, key_down=Lmb},
+			entry! {action=SelectMessage::DragStart{add_to_selection: KeyShift}, key_down=Lmb},
 			entry! {action=SelectMessage::DragStop, key_up=Lmb},
 			entry! {action=SelectMessage::Abort, key_down=Rmb},
 			entry! {action=SelectMessage::Abort, key_down=KeyEscape},

editor/src/input/keyboard.rs

@@ -1,4 +1,5 @@
 use crate::message_prelude::*;
+use serde::{Deserialize, Serialize};
 
 pub const NUMBER_OF_KEYS: usize = Key::NumKeys as usize;
 // Edit this to specify the storage type used
@@ -12,7 +13,7 @@ const KEY_MASK_STORAGE_LENGTH: usize = (NUMBER_OF_KEYS + STORAGE_SIZE_BITS - 1)
 pub type KeyStates = BitVector<KEY_MASK_STORAGE_LENGTH>;
 
 #[impl_message(Message, InputMapperMessage, KeyDown)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum Key {
 	UnknownKey,
 	// MouseKeys

editor/src/tool/tools/select.rs

@@ -8,6 +8,7 @@ use graphene::Quad;
 use glam::{DAffine2, DVec2};
 use serde::{Deserialize, Serialize};
 
+use crate::input::keyboard::Key;
 use crate::input::{mouse::ViewportPosition, InputPreprocessor};
 use crate::tool::{DocumentToolData, Fsm, ToolActionHandlerData};
 use crate::{
@@ -25,7 +26,7 @@ pub struct Select {
 #[impl_message(Message, ToolMessage, Select)]
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, Hash)]
 pub enum SelectMessage {
-	DragStart,
+	DragStart { add_to_selection: Key },
 	DragStop,
 	MouseMove,
 	Abort,
@@ -136,7 +137,7 @@ impl Fsm for SelectToolFsmState {
 					responses.push_back(response);
 					self
 				}
-				(Ready, DragStart) => {
+				(Ready, DragStart { add_to_selection }) => {
 					data.drag_start = input.mouse.position;
 					data.drag_current = input.mouse.position;
 					let mut selected: Vec<_> = document.selected_layers().cloned().collect();
@@ -146,7 +147,7 @@ impl Fsm for SelectToolFsmState {
 					if selected.is_empty() {
 						if let Some(layer) = intersection.last() {
 							selected.push(layer.clone());
-							responses.push_back(DocumentMessage::SelectLayers(selected.clone()).into());
+							responses.push_back(DocumentMessage::SetSelectedLayers(selected.clone()).into());
 						}
 					}
 					// If the user clicks on a layer that is in their current selection, go into the dragging mode.
@@ -155,7 +156,9 @@ impl Fsm for SelectToolFsmState {
 						data.layers_dragging = selected;
 						Dragging
 					} else {
-						responses.push_back(DocumentMessage::DeselectAllLayers.into());
+						if !input.keyboard.get(add_to_selection as usize) {
+							responses.push_back(DocumentMessage::DeselectAllLayers.into());
+						}
 						data.drag_box_id = Some(add_boundnig_box(responses));
 						DrawingBox
 					}
@@ -176,8 +179,9 @@ impl Fsm for SelectToolFsmState {
 				}
 				(DrawingBox, MouseMove) => {
 					data.drag_current = input.mouse.position;
-					let start = data.drag_start;
-					let size = data.drag_current - start;
+					let half_pixel_offset = DVec2::new(0.5, 0.5);
+					let start = data.drag_start + half_pixel_offset;
+					let size = data.drag_current - start + half_pixel_offset;
 
 					responses.push_back(
 						Operation::SetLayerTransformInViewport {
@@ -191,14 +195,14 @@ impl Fsm for SelectToolFsmState {
 				(Dragging, DragStop) => Ready,
 				(DrawingBox, DragStop) => {
 					let quad = data.selection_quad();
-					responses.push_back(DocumentMessage::SelectLayers(document.document.intersects_quad_root(quad)).into());
+					responses.push_back(DocumentMessage::AddSelectedLayers(document.document.intersects_quad_root(quad)).into());
 					responses.push_back(
 						Operation::DeleteLayer {
 							path: data.drag_box_id.take().unwrap(),
 						}
 						.into(),
 					);
-                    data.drag_box_id = None;
+					data.drag_box_id = None;
 					Ready
 				}
 				(_, Abort) => {

frontend/wasm/src/document.rs

@@ -310,7 +310,7 @@ pub fn set_rotation(new_radians: f64) -> Result<(), JsValue> {
 pub fn select_layers(paths: Vec<LayerId>) -> Result<(), JsValue> {
 	let paths = paths.split(|id| *id == LayerId::MAX).map(|path| path.to_vec()).collect();
 	EDITOR_STATE
-		.with(|editor| editor.borrow_mut().handle_message(DocumentMessage::SelectLayers(paths)))
+		.with(|editor| editor.borrow_mut().handle_message(DocumentMessage::SetSelectedLayers(paths)))
 		.map_err(convert_error)
 }