Remove the "coming soon" dialog and hide not-yet-ready features/tools

Author: Keavon

editor/src/messages/dialog/dialog_message.rs

@@ -25,9 +25,6 @@ pub enum DialogMessage {
 		localized_commit_date: String,
 		localized_commit_year: String,
 	},
-	RequestComingSoonDialog {
-		issue: Option<u32>,
-	},
 	RequestDemoArtworkDialog,
 	RequestExportDialog,
 	RequestLicensesDialogWithLocalizedCommitDate {

editor/src/messages/dialog/dialog_message_handler.rs

@@ -1,4 +1,4 @@
-use super::simple_dialogs::{self, AboutGraphiteDialog, ComingSoonDialog, DemoArtworkDialog, LicensesDialog};
+use super::simple_dialogs::{self, AboutGraphiteDialog, DemoArtworkDialog, LicensesDialog};
 use crate::messages::dialog::simple_dialogs::LicensesThirdPartyDialog;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
@@ -62,10 +62,6 @@ impl MessageHandler<DialogMessage, DialogMessageContext<'_>> for DialogMessageHa
 
 				dialog.send_dialog_to_frontend(responses);
 			}
-			DialogMessage::RequestComingSoonDialog { issue } => {
-				let dialog = ComingSoonDialog { issue };
-				dialog.send_dialog_to_frontend(responses);
-			}
 			DialogMessage::RequestDemoArtworkDialog => {
 				let dialog = DemoArtworkDialog;
 				dialog.send_dialog_to_frontend(responses);

editor/src/messages/dialog/simple_dialogs/coming_soon_dialog.rs

@@ -1,7 +1,6 @@
 mod about_graphite_dialog;
 mod close_all_documents_dialog;
 mod close_document_dialog;
-mod coming_soon_dialog;
 mod demo_artwork_dialog;
 mod error_dialog;
 mod licenses_dialog;
@@ -10,7 +9,6 @@ mod licenses_third_party_dialog;
 pub use about_graphite_dialog::AboutGraphiteDialog;
 pub use close_all_documents_dialog::CloseAllDocumentsDialog;
 pub use close_document_dialog::CloseDocumentDialog;
-pub use coming_soon_dialog::ComingSoonDialog;
 pub use demo_artwork_dialog::ARTWORK;
 pub use demo_artwork_dialog::DemoArtworkDialog;
 pub use error_dialog::ErrorDialog;

editor/src/messages/dialog/simple_dialogs/mod.rs

@@ -224,9 +224,6 @@ pub enum FrontendMessage {
 		#[serde(rename = "dataBuffer")]
 		data_buffer: JsRawBuffer,
 	},
-	UpdateDocumentModeLayout {
-		diff: Vec<WidgetDiff>,
-	},
 	UpdateDocumentRulers {
 		origin: (f64, f64),
 		spacing: f64,

editor/src/messages/frontend/frontend_message.rs

@@ -8,6 +8,7 @@ use crate::messages::input_mapper::utility_types::misc::{KeyMappingEntries, Mapp
 use crate::messages::portfolio::document::node_graph::utility_types::Direction;
 use crate::messages::portfolio::document::utility_types::clipboards::Clipboard;
 use crate::messages::portfolio::document::utility_types::misc::GroupFolderType;
+use crate::messages::portfolio::utility_types::KeyboardPlatformLayout;
 use crate::messages::prelude::*;
 use crate::messages::tool::tool_messages::brush_tool::BrushToolMessageOptionsUpdate;
 use crate::messages::tool::tool_messages::select_tool::SelectToolPointerKeys;
@@ -493,16 +494,20 @@ pub fn input_mappings() -> Mapping {
 pub fn zoom_with_scroll() -> Mapping {
 	use InputMapperMessage::*;
 
+	// On Mac, the OS already converts Shift+scroll into horizontal scrolling so we have to reverse the behavior from normal to produce the same outcome
+	let keyboard_platform = GLOBAL_PLATFORM.get().copied().unwrap_or_default().as_keyboard_platform_layout();
+
 	let mut mapping = input_mappings();
 
 	let remove = [
 		entry!(WheelScroll; modifiers=[Control], action_dispatch=NavigationMessage::CanvasZoomMouseWheel),
+		entry!(WheelScroll; modifiers=[Command], action_dispatch=NavigationMessage::CanvasZoomMouseWheel),
 		entry!(WheelScroll; modifiers=[Shift], action_dispatch=NavigationMessage::CanvasPanMouseWheel { use_y_as_x: true }),
 		entry!(WheelScroll; action_dispatch=NavigationMessage::CanvasPanMouseWheel { use_y_as_x: false }),
 	];
 	let add = [
-		entry!(WheelScroll; modifiers=[Control], action_dispatch=NavigationMessage::CanvasPanMouseWheel { use_y_as_x: true }),
-		entry!(WheelScroll; modifiers=[Shift], action_dispatch=NavigationMessage::CanvasPanMouseWheel { use_y_as_x: false }),
+		entry!(WheelScroll; modifiers=[Control], action_dispatch=NavigationMessage::CanvasPanMouseWheel { use_y_as_x: keyboard_platform == KeyboardPlatformLayout::Mac }),
+		entry!(WheelScroll; modifiers=[Shift], action_dispatch=NavigationMessage::CanvasPanMouseWheel { use_y_as_x: keyboard_platform != KeyboardPlatformLayout::Mac }),
 		entry!(WheelScroll; action_dispatch=NavigationMessage::CanvasZoomMouseWheel),
 	];
 

editor/src/messages/input_mapper/input_mappings.rs

@@ -505,7 +505,6 @@ impl LayoutMessageHandler {
 			LayoutTarget::DialogColumn1 => FrontendMessage::UpdateDialogColumn1 { diff },
 			LayoutTarget::DialogColumn2 => FrontendMessage::UpdateDialogColumn2 { diff },
 			LayoutTarget::DocumentBar => FrontendMessage::UpdateDocumentBarLayout { diff },
-			LayoutTarget::DocumentMode => FrontendMessage::UpdateDocumentModeLayout { diff },
 			LayoutTarget::LayersPanelBottomBar => FrontendMessage::UpdateLayersPanelBottomBarLayout { diff },
 			LayoutTarget::LayersPanelControlLeftBar => FrontendMessage::UpdateLayersPanelControlBarLeftLayout { diff },
 			LayoutTarget::LayersPanelControlRightBar => FrontendMessage::UpdateLayersPanelControlBarRightLayout { diff },

editor/src/messages/layout/layout_message_handler.rs

@@ -29,8 +29,6 @@ pub enum LayoutTarget {
 	DialogColumn2,
 	/// Contains the widgets located directly above the canvas to the right, for example the zoom in and out buttons.
 	DocumentBar,
-	/// Contains the dropdown for design / select / guide mode found on the top left of the canvas.
-	DocumentMode,
 	/// Controls for adding, grouping, and deleting layers at the bottom of the Layers panel.
 	LayersPanelBottomBar,
 	/// Blending options at the top of the Layers panel.
@@ -45,7 +43,7 @@ pub enum LayoutTarget {
 	PropertiesPanel,
 	/// The contextual input key/mouse combination shortcuts shown in the status bar at the bottom of the window.
 	StatusBarHints,
-	/// The bar directly above the canvas, left-aligned and to the right of the document mode dropdown.
+	/// The left side of the control bar directly above the canvas.
 	ToolOptions,
 	/// The vertical buttons for all of the tools on the left of the canvas.
 	ToolShelf,

editor/src/messages/layout/utility_types/layout_widget.rs

@@ -17,7 +17,7 @@ use crate::messages::portfolio::document::overlays::grid_overlays::{grid_overlay
 use crate::messages::portfolio::document::overlays::utility_types::{OverlaysType, OverlaysVisibilitySettings};
 use crate::messages::portfolio::document::properties_panel::properties_panel_message_handler::PropertiesPanelMessageContext;
 use crate::messages::portfolio::document::utility_types::document_metadata::{DocumentMetadata, LayerNodeIdentifier};
-use crate::messages::portfolio::document::utility_types::misc::{AlignAggregate, AlignAxis, DocumentMode, FlipAxis, PTZ};
+use crate::messages::portfolio::document::utility_types::misc::{AlignAggregate, AlignAxis, FlipAxis, PTZ};
 use crate::messages::portfolio::document::utility_types::network_interface::{FlowType, InputConnector, NodeTemplate};
 use crate::messages::portfolio::document::utility_types::nodes::RawBuffer;
 use crate::messages::portfolio::utility_types::PanelType;
@@ -91,8 +91,6 @@ pub struct DocumentMessageHandler {
 	pub commit_hash: String,
 	/// The current pan, tilt, and zoom state of the viewport's view of the document canvas.
 	pub document_ptz: PTZ,
-	/// The current mode that the document is in, which starts out as Design Mode. This choice affects the editing behavior of the tools.
-	pub document_mode: DocumentMode,
 	/// The current mode that the user has set for rendering the document within the viewport.
 	/// This is usually "Normal" but can be set to "Outline" or "Pixels" to see the canvas differently.
 	#[serde(alias = "view_mode")]
@@ -164,7 +162,6 @@ impl Default for DocumentMessageHandler {
 			collapsed: CollapsedLayers::default(),
 			commit_hash: GRAPHITE_GIT_COMMIT_HASH.to_string(),
 			document_ptz: PTZ::default(),
-			document_mode: DocumentMode::DesignMode,
 			render_mode: RenderMode::default(),
 			overlays_visibility_settings: OverlaysVisibilitySettings::default(),
 			rulers_visible: true,
@@ -1859,8 +1856,6 @@ impl DocumentMessageHandler {
 					pub commit_hash: String,
 					/// The current pan, tilt, and zoom state of the viewport's view of the document canvas.
 					pub document_ptz: PTZ,
-					/// The current mode that the document is in, which starts out as Design Mode. This choice affects the editing behavior of the tools.
-					pub document_mode: DocumentMode,
 					/// The current mode that the user has set for rendering the document within the viewport.
 					/// This is usually "Normal" but can be set to "Outline" or "Pixels" to see the canvas differently.
 					pub view_mode: RenderMode,
@@ -1880,7 +1875,6 @@ impl DocumentMessageHandler {
 					collapsed: old_message_handler.collapsed,
 					commit_hash: old_message_handler.commit_hash,
 					document_ptz: old_message_handler.document_ptz,
-					document_mode: old_message_handler.document_mode,
 					render_mode: old_message_handler.view_mode,
 					overlays_visibility_settings: old_message_handler.overlays_visibility_settings,
 					rulers_visible: old_message_handler.rulers_visible,
@@ -2193,36 +2187,36 @@ impl DocumentMessageHandler {
 	}
 
 	pub fn update_document_widgets(&self, responses: &mut VecDeque<Message>, animation_is_playing: bool, time: Duration) {
-		// Document mode (dropdown menu at the left of the bar above the viewport, before the tool options)
-
-		let layout = Layout(vec![LayoutGroup::Row {
-			widgets: vec![
-				// DropdownInput::new(
-				// 	vec![vec![
-				// 		MenuListEntry::new(format!("{:?}", DocumentMode::DesignMode))
-				// 			.label(DocumentMode::DesignMode.to_string())
-				// 			.icon(DocumentMode::DesignMode.icon_name()),
-				// 		MenuListEntry::new(format!("{:?}", DocumentMode::SelectMode))
-				// 			.label(DocumentMode::SelectMode.to_string())
-				// 			.icon(DocumentMode::SelectMode.icon_name())
-				// 			.on_commit(|_| DialogMessage::RequestComingSoonDialog { issue: Some(330) }.into()),
-				// 		MenuListEntry::new(format!("{:?}", DocumentMode::GuideMode))
-				// 			.label(DocumentMode::GuideMode.to_string())
-				// 			.icon(DocumentMode::GuideMode.icon_name())
-				// 			.on_commit(|_| DialogMessage::RequestComingSoonDialog { issue: Some(331) }.into()),
-				// 	]])
-				// 	.selected_index(Some(self.document_mode as u32))
-				// 	.draw_icon(true)
-				// 	.interactive(false) // TODO: set to true when dialogs are not spawned
-				// 	.widget_instance(),
-				// Separator::new(SeparatorType::Section).widget_instance(),
-			],
-		}]);
-
-		responses.add(LayoutMessage::SendLayout {
-			layout,
-			layout_target: LayoutTarget::DocumentMode,
-		});
+		// // Document mode (dropdown menu at the left of the bar above the viewport, before the tool options)
+		// let layout = Layout(vec![LayoutGroup::Row {
+		// 	widgets: vec![
+		// 		DropdownInput::new(
+		// 			vec![vec![
+		// 				MenuListEntry::new(format!("{:?}", DocumentMode::DesignMode))
+		// 					.label(DocumentMode::DesignMode.to_string())
+		// 					.icon(DocumentMode::DesignMode.icon_name()),
+		// 				// TODO: See issue #330
+		// 				MenuListEntry::new(format!("{:?}", DocumentMode::SelectMode))
+		// 					.label(DocumentMode::SelectMode.to_string())
+		// 					.icon(DocumentMode::SelectMode.icon_name())
+		// 					.on_commit(|_| todo!()),
+		// 				// TODO: See issue #331
+		// 				MenuListEntry::new(format!("{:?}", DocumentMode::GuideMode))
+		// 					.label(DocumentMode::GuideMode.to_string())
+		// 					.icon(DocumentMode::GuideMode.icon_name())
+		// 					.on_commit(|_| todo!()),
+		// 			]])
+		// 			.selected_index(Some(self.document_mode as u32))
+		// 			.draw_icon(true)
+		// 			.interactive(false)
+		// 			.widget_instance(),
+		// 		Separator::new(SeparatorType::Section).widget_instance(),
+		// 	],
+		// }]);
+		// responses.add(LayoutMessage::SendLayout {
+		// 	layout,
+		// 	layout_target: LayoutTarget::DocumentMode,
+		// });
 
 		// Document bar (right portion of the bar above the viewport)
 
@@ -2581,29 +2575,20 @@ impl DocumentMessageHandler {
 					.icon("RenderModeOutline")
 					.tooltip_label("Render Mode: Outline")
 					.on_update(|_| DocumentMessage::SetRenderMode { render_mode: RenderMode::Outline }.into()),
+				// TODO: See issue #320
 				// RadioEntryData::new("PixelPreview")
 				// 	.icon("RenderModePixels")
 				// 	.tooltip_label("Render Mode: Pixel Preview")
-				// 	.on_update(|_| DialogMessage::RequestComingSoonDialog { issue: Some(320) }.into()),
+				// 	.on_update(|_| todo!()),
+				// TODO: See issue #1845
 				// RadioEntryData::new("SvgPreview")
 				// 	.icon("RenderModeSvg")
 				// 	.tooltip_label("Render Mode: SVG Preview")
-				// 	.on_update(|_| DialogMessage::RequestComingSoonDialog { issue: Some(1845) }.into()),
+				// 	.on_update(|_| todo!()),
 			])
 			.selected_index(Some(self.render_mode as u32))
 			.narrow(true)
 			.widget_instance(),
-			// PopoverButton::new().popover_layout(
-			// 	Layout(vec![
-			// 		LayoutGroup::Row {
-			// 			widgets: vec![TextLabel::new("Render Mode").bold(true).widget_instance()],
-			// 		},
-			// 		LayoutGroup::Row {
-			// 			widgets: vec![TextLabel::new("Coming soon").widget_instance()],
-			// 		},
-			// 	])
-			// 	.widget_instance(),
-			// ),
 			Separator::new(SeparatorType::Unrelated).widget_instance(),
 		];
 

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -204,7 +204,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphMessageContext<'a>> for NodeG
 			NodeGraphMessage::CreateWire { output_connector, input_connector } => {
 				// TODO: Add support for flattening NodeInput::Import exports in flatten_with_fns https://github.com/GraphiteEditor/Graphite/issues/1762
 				if matches!(input_connector, InputConnector::Export(_)) && matches!(output_connector, OutputConnector::Import { .. }) {
-					responses.add(DialogMessage::RequestComingSoonDialog { issue: Some(1762) });
+					// We return early for now until this case becomes supported, then we can remove this
 					return;
 				}
 				network_interface.create_wire(&output_connector, &input_connector, selection_network_path);