wip

GraphiteEditor · Apr 12, 2024 · 8e48669 · 8e48669
1 parent dfb2a7d
commit 8e48669
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 62 deletions.
diff --git a/editor/src/messages/portfolio/document/document_message.rs b/editor/src/messages/portfolio/document/document_message.rs
@@ -35,6 +35,7 @@ pub enum DocumentMessage {
 		aggregate: AlignAggregate,
 		align_to_artboard: bool,
 		align_link_selected: bool,
+		align_reference_layer: Option<LayerNodeIdentifier>,
 	},
 	BackupDocument {
 		network: NodeNetwork,

diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs
@@ -179,6 +179,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 				aggregate,
 				align_to_artboard,
 				align_link_selected,
+				align_reference_layer,
 			} => {
 				self.backup(responses);
 

diff --git a/editor/src/messages/tool/tool_messages/select_tool.rs b/editor/src/messages/tool/tool_messages/select_tool.rs
@@ -118,7 +118,7 @@ impl SelectTool {
 			.widget_holder()
 	}
 
-	fn alignment_widgets(&self, disabled: bool, align_to_artboard: bool, align_link_selected: bool, reference_layer: Option<LayerNodeIdentifier>) -> impl Iterator<Item = WidgetHolder> {
+	fn alignment_widgets(&self, disabled: bool, align_to_artboard: bool, align_link_selected: bool, align_reference_layer: Option<LayerNodeIdentifier>) -> impl Iterator<Item = WidgetHolder> {
 		[AlignAxis::X, AlignAxis::Y]
 			.into_iter()
 			.flat_map(|axis| [(axis, AlignAggregate::Min), (axis, AlignAggregate::Center), (axis, AlignAggregate::Max)])
@@ -139,6 +139,7 @@ impl SelectTool {
 							aggregate,
 							align_to_artboard,
 							align_link_selected,
+							align_reference_layer,
 						}
 						.into()
 					})
@@ -166,30 +167,7 @@ impl SelectTool {
 		})
 	}
 
-	fn should_refresh_align_checkboxes(&mut self) -> bool {
-		let checkbox_changed = self.tool_data.align_checkbox_changed;
-		self.tool_data.align_checkbox_changed = false;
-		checkbox_changed
-	}
-
-	pub fn should_update_widgets(&mut self) -> bool {
-		self.tool_data.pivot.should_refresh_pivot_position() || self.should_refresh_align_checkboxes()
-	}
-
-	fn layout(&self, document: &DocumentMessageHandler) -> Layout {
-		let mut widgets = Vec::new();
-
-		// Select mode (Deep/Shallow)
-		widgets.push(self.deep_selection_widget());
-
-		// Pivot
-		widgets.push(Separator::new(SeparatorType::Unrelated).widget_holder());
-		widgets.push(self.pivot_widget(self.tool_data.selected_layers_count == 0));
-
-		// WIP: add layer selection drop-down to align relative to it.
-		// TODO: move this to a dedicated method
-		debug!("selected! {:?}", self.tool_data.layers_dragging);
-
+	fn align_popover_menu_widgets(&self, document: &DocumentMessageHandler) -> WidgetHolder {
 		let selected_layers_ids = &self.tool_data.layers_dragging;
 		let selected_layers_names: Vec<String> = selected_layers_ids
 			.iter()
@@ -214,45 +192,66 @@ impl SelectTool {
 		}
 		let entries = vec![entries];
 
-		// Align
 		let align_to_artboard = self.tool_data.align_to_artboard;
 		let align_link_selected = self.tool_data.align_link_selected;
-		let disabled = self.tool_data.selected_layers_count == 0 || (!align_to_artboard && self.tool_data.selected_layers_count < 2);
+
+		PopoverButton::new("Align", "Change alignment properties")
+			.options_widget(vec![
+				// TODO: This option should be hidden when the canvas is infinite.
+				LayoutGroup::Row {
+					widgets: vec![
+						CheckboxInput::new(align_to_artboard)
+							.tooltip("Align selection relative to artboard.")
+							.on_update(move |input: &CheckboxInput| SelectToolMessage::SetAlignedToArtboard(input.checked).into())
+							.widget_holder(),
+						TextLabel::new("To Artboard").widget_holder(),
+					],
+				},
+				LayoutGroup::Row {
+					widgets: vec![
+						CheckboxInput::new(align_link_selected)
+							.disabled(!align_to_artboard)
+							.tooltip("Align combined bounding box.")
+							.on_update(move |input: &CheckboxInput| SelectToolMessage::SetAlignLinkSelected(input.checked).into())
+							.widget_holder(),
+						TextLabel::new("Link selected objects").widget_holder(),
+					],
+				},
+				LayoutGroup::Row {
+					widgets: vec![TextLabel::new("Select a reference layer:").widget_holder()],
+				},
+				LayoutGroup::Row {
+					widgets: vec![DropdownInput::new(entries).selected_index(None).disabled(align_to_artboard).widget_holder()],
+				},
+			])
+			.widget_holder()
+	}
+
+	fn should_refresh_align_checkboxes(&mut self) -> bool {
+		let checkbox_changed = self.tool_data.align_checkbox_changed;
+		self.tool_data.align_checkbox_changed = false;
+		checkbox_changed
+	}
+
+	pub fn should_update_widgets(&mut self) -> bool {
+		self.tool_data.pivot.should_refresh_pivot_position() || self.should_refresh_align_checkboxes()
+	}
+
+	fn layout(&self, document: &DocumentMessageHandler) -> Layout {
+		let mut widgets = Vec::new();
+
+		// Select mode (Deep/Shallow)
+		widgets.push(self.deep_selection_widget());
+
+		// Pivot
 		widgets.push(Separator::new(SeparatorType::Unrelated).widget_holder());
-		widgets.extend(self.alignment_widgets(disabled, align_to_artboard, align_link_selected, self.tool_data.align_reference_layer));
-		widgets.push(
-			PopoverButton::new("Align", "Change alignment properties")
-				.options_widget(vec![
-					// TODO: This option should be hidden when the canvas is infinite.
-					LayoutGroup::Row {
-						widgets: vec![
-							CheckboxInput::new(align_to_artboard)
-								.tooltip("Align selection relative to artboard.")
-								.on_update(move |input: &CheckboxInput| SelectToolMessage::SetAlignedToArtboard(input.checked).into())
-								.widget_holder(),
-							TextLabel::new("To Artboard").widget_holder(),
-						],
-					},
-					LayoutGroup::Row {
-						widgets: vec![
-							CheckboxInput::new(align_link_selected)
-								.disabled(!align_to_artboard)
-								.tooltip("Align combined bounding box.")
-								.on_update(move |input: &CheckboxInput| SelectToolMessage::SetAlignLinkSelected(input.checked).into())
-								.widget_holder(),
-							TextLabel::new("Link selected objects").widget_holder(),
-						],
-					},
-					// See WIP above.
-					LayoutGroup::Row {
-						widgets: vec![
-							DropdownInput::new(entries).selected_index(None).disabled(align_to_artboard).widget_holder(),
-							TextLabel::new("Select a reference layer.").widget_holder(),
-						],
-					},
-				])
-				.widget_holder(),
-		);
+		widgets.push(self.pivot_widget(self.tool_data.selected_layers_count == 0));
+
+		// Align
+		let disabled = self.tool_data.selected_layers_count == 0 || (!self.tool_data.align_to_artboard && self.tool_data.selected_layers_count < 2);
+		widgets.push(Separator::new(SeparatorType::Unrelated).widget_holder());
+		widgets.extend(self.alignment_widgets(disabled, self.tool_data.align_to_artboard, self.tool_data.align_link_selected, self.tool_data.align_reference_layer));
+		widgets.push(self.align_popover_menu_widgets(document));
 
 		// Flip
 		let disabled = self.tool_data.selected_layers_count == 0;

diff --git a/frontend/src/components/floating-menus/MenuList.svelte b/frontend/src/components/floating-menus/MenuList.svelte
@@ -415,7 +415,7 @@
 			{#each currentEntries(section, virtualScrollingEntryHeight, virtualScrollingStartIndex, virtualScrollingEndIndex, search) as entry, entryIndex (entryIndex + startIndex)}
 				<LayoutRow
 					class="row"
-					classes={{ open: isEntryOpen(entry), active: entry.label === highlighted?.label, disabled: Boolean(entry.disabled) }}
+					classes={{ open: isEntryOpen(entry), active: entry.value === highlighted?.value, disabled: Boolean(entry.disabled) }}
 					styles={{ height: virtualScrollingEntryHeight || "20px" }}
 					{tooltip}
 					on:click={() => !entry.disabled && onEntryClick(entry)}