Merge branch 'master' into feat/layers-panel-alt-drag-duplicate

Author: afrdbaig7

.nix/pkgs/graphite.nix

@@ -44,18 +44,15 @@ let
     // {
       cargoArtifacts = deps.crane.lib.buildDepsOnly resourcesCommon;
 
-      # TODO: Remove the need for this hash by using individual package resolutions and hashes from package-lock.json
-      npmDeps = pkgs.fetchNpmDeps {
-        inherit (info) pname version;
-        src = "${info.src}/frontend";
-        hash = "sha256-D8VCNK+Ca3gxO+5wriBn8FszG8/x8n/zM6/MPo9E2j4=";
+      npmDeps = pkgs.importNpmLock {
+        npmRoot = "${info.src}/frontend";
       };
 
       npmRoot = "frontend";
       npmConfigScript = "setup";
       makeCacheWritable = true;
 
-      nativeBuildInputs = tools.frontend ++ [ pkgs.npmHooks.npmConfigHook ];
+      nativeBuildInputs = tools.frontend ++ [ pkgs.importNpmLock.npmConfigHook ];
 
       prePatch = ''
         mkdir branding
@@ -109,13 +106,20 @@ deps.crane.lib.buildPackage (
           }
         else
           { }
-      );
+      ) // {
+        GRAPHITE_GIT_COMMIT_HASH = inputs.self.rev or "unknown";
+        GRAPHITE_GIT_COMMIT_DATE = inputs.self.lastModified or "unknown";
+      };
 
     postUnpack = ''
       mkdir ./branding
       cp -r ${branding}/* ./branding
     '';
 
+    preBuild = if inputs.self ? rev then ''
+      export GRAPHITE_GIT_COMMIT_DATE="$(date -u -d "@$GRAPHITE_GIT_COMMIT_DATE" +"%Y-%m-%dT%H:%M:%SZ")"
+    '' else "";
+
     installPhase = ''
       mkdir -p $out/bin
       cp target/${if dev then "debug" else "release"}/graphite $out/bin/graphite
@@ -125,6 +129,12 @@ deps.crane.lib.buildPackage (
 
       mkdir -p $out/share/icons/hicolor/scalable/apps
       cp ${branding}/app-icons/graphite.svg $out/share/icons/hicolor/scalable/apps/art.graphite.Graphite.svg
+      mkdir -p $out/share/icons/hicolor/512x512/apps
+      cp ${branding}/app-icons/graphite-512.png $out/share/icons/hicolor/512x512/apps/art.graphite.Graphite.png
+      mkdir -p $out/share/icons/hicolor/256x256/apps
+      cp ${branding}/app-icons/graphite-256.png $out/share/icons/hicolor/256x256/apps/art.graphite.Graphite.png
+      mkdir -p $out/share/icons/hicolor/128x128/apps
+      cp ${branding}/app-icons/graphite-128.png $out/share/icons/hicolor/128x128/apps/art.graphite.Graphite.png
     '';
 
     postFixup = ''

.vscode/extensions.json

@@ -11,9 +11,10 @@
 		// Code quality
 		"wayou.vscode-todo-highlight",
 		"streetsidesoftware.code-spell-checker",
-		// Helpful
+		// Git
 		"mhutchie.git-graph",
 		"qezhu.gitlink",
+		// Helpful
 		"wmaurer.change-case"
 	]
 }

.vscode/settings.json

@@ -32,6 +32,7 @@
 		"editor.formatOnSave": false
 	},
 	// Rust Analyzer config
+	"rust-analyzer.check.command": "clippy",
 	"rust-analyzer.cargo.allTargets": false,
 	"rust-analyzer.procMacro.ignored": {
 		"serde_derive": ["Serialize", "Deserialize"],
@@ -47,13 +48,35 @@
 		"vite-plugin-svelte-css-no-scopable-elements": "ignore", // NOTICE: Keep this list in sync with the list in `frontend/vite.config.ts`
 		"a11y-no-static-element-interactions": "ignore", // NOTICE: Keep this list in sync with the list in `frontend/vite.config.ts`
 		"a11y-no-noninteractive-element-interactions": "ignore", // NOTICE: Keep this list in sync with the list in `frontend/vite.config.ts`
-		"a11y-click-events-have-key-events": "ignore" // NOTICE: Keep this list in sync with the list in `frontend/vite.config.ts`
+		"a11y-click-events-have-key-events": "ignore", // NOTICE: Keep this list in sync with the list in `frontend/vite.config.ts`
+		"a11y_consider_explicit_label": "ignore", // NOTICE: Keep this list in sync with the list in `frontend/vite.config.ts`
+		"a11y_click_events_have_key_events": "ignore", // NOTICE: Keep this list in sync with the list in `frontend/vite.config.ts`
+		"a11y_no_noninteractive_element_interactions": "ignore" // NOTICE: Keep this list in sync with the list in `frontend/vite.config.ts`
 	},
+	// Git Graph config
+	"git-graph.repository.fetchAndPrune": true,
+	"git-graph.repository.showRemoteHeads": false,
+	"git-graph.repository.commits.fetchAvatars": true,
+	// VS Code Git config
+	"git.autofetch": true,
+	"git.enableStatusBarSync": false,
+	"git.showActionButton": {
+		"sync": false
+	},
+	// CSpell config
+	"cSpell.language": "en-US",
+	"cSpell.logLevel": "Information",
+	"cSpell.allowCompoundWords": true,
+	// Other extensions config
+	"evenBetterToml.formatter.alignComments": false,
+	"package-json-upgrade.ignorePatterns": ["source-sans-pro"],
 	// VS Code config
 	"html.format.wrapLineLength": 200,
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,
 	"files.associations": {
 		"*.graphite": "json"
-	}
+	},
+	"editor.renderWhitespace": "boundary",
+	"editor.minimap.markSectionHeaderRegex": "// ===+\\n\\s*//\\s*(?<label>[^\\n]{1,18})[^\\n]*(\\n\\s*//[^\\n]*)*\\n\\s*// ===+"
 }

desktop/src/app.rs

@@ -5,7 +5,7 @@ use std::sync::mpsc::{Receiver, Sender, SyncSender};
 use std::thread;
 use std::time::{Duration, Instant};
 use winit::application::ApplicationHandler;
-use winit::dpi::PhysicalSize;
+use winit::dpi::{PhysicalPosition, PhysicalSize};
 use winit::event::{ButtonSource, ElementState, MouseButton, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, ControlFlow};
 use winit::window::WindowId;
@@ -27,6 +27,8 @@ pub(crate) struct App {
 	window_size: PhysicalSize<u32>,
 	window_maximized: bool,
 	window_fullscreen: bool,
+	pointer_position: PhysicalPosition<f64>,
+	pointer_lock_position: Option<PhysicalPosition<f64>>,
 	ui_scale: f64,
 	app_event_receiver: Receiver<AppEvent>,
 	app_event_scheduler: AppEventScheduler,
@@ -84,6 +86,8 @@ impl App {
 			window_size: PhysicalSize { width: 0, height: 0 },
 			window_maximized: false,
 			window_fullscreen: false,
+			pointer_position: Default::default(),
+			pointer_lock_position: Default::default(),
 			ui_scale: 1.,
 			app_event_receiver,
 			app_event_scheduler,
@@ -329,6 +333,12 @@ impl App {
 					window.clipboard_write(content);
 				}
 			}
+			DesktopFrontendMessage::PointerLock => {
+				self.pointer_lock_position = Some(self.pointer_position);
+				if let Some(window) = &self.window {
+					window.start_pointer_lock();
+				}
+			}
 			DesktopFrontendMessage::WindowClose => {
 				self.app_event_scheduler.schedule(AppEvent::CloseWindow);
 			}
@@ -480,6 +490,26 @@ impl ApplicationHandler for App {
 	}
 
 	fn window_event(&mut self, event_loop: &dyn ActiveEventLoop, _window_id: WindowId, event: WindowEvent) {
+		// Handle pointer lock release
+		if let Some(pointer_lock_position) = self.pointer_lock_position
+			&& let WindowEvent::PointerButton {
+				state: ElementState::Released,
+				button: ButtonSource::Mouse(MouseButton::Left),
+				..
+			} = event
+		{
+			self.pointer_lock_position = None;
+			if let Some(window) = &self.window {
+				window.end_pointer_lock();
+			}
+			self.cef_context.handle_window_event(&WindowEvent::PointerMoved {
+				device_id: None,
+				position: pointer_lock_position,
+				primary: true,
+				source: winit::event::PointerSource::Mouse,
+			});
+		}
+
 		self.cef_context.handle_window_event(&event);
 
 		match event {
@@ -556,13 +586,29 @@ impl ApplicationHandler for App {
 					self.app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(message));
 				}
 			}
+
+			WindowEvent::PointerMoved { position, .. } | WindowEvent::PointerLeft { position: Some(position), .. } | WindowEvent::PointerEntered { position, .. }
+				if self.pointer_lock_position.is_none() =>
+			{
+				self.pointer_position = position;
+			}
+
 			_ => {}
 		}
 
 		// Notify cef of possible input events
 		self.cef_context.work();
 	}
 
+	fn device_event(&mut self, _event_loop: &dyn ActiveEventLoop, _device_id: Option<winit::event::DeviceId>, event: winit::event::DeviceEvent) {
+		if self.pointer_lock_position.is_some()
+			&& let winit::event::DeviceEvent::PointerMotion { delta: (x, y) } = event
+		{
+			let message = DesktopWrapperMessage::PointerLockMove { x, y };
+			self.app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(message));
+		}
+	}
+
 	fn about_to_wait(&mut self, event_loop: &dyn ActiveEventLoop) {
 		// Set a timeout in case we miss any cef schedule requests
 		let timeout = Instant::now() + Duration::from_millis(10);

desktop/src/window.rs

@@ -159,6 +159,16 @@ impl Window {
 		self.winit_window.set_cursor(cursor);
 	}
 
+	pub(crate) fn start_pointer_lock(&self) {
+		let _ = self.winit_window.set_cursor_grab(winit::window::CursorGrabMode::Locked);
+		self.winit_window.set_cursor_visible(false);
+	}
+
+	pub(crate) fn end_pointer_lock(&self) {
+		let _ = self.winit_window.set_cursor_grab(winit::window::CursorGrabMode::None);
+		self.winit_window.set_cursor_visible(true);
+	}
+
 	pub(crate) fn update_menu(&self, entries: Vec<MenuItem>) {
 		self.native_handle.update_menu(entries);
 	}

desktop/wrapper/src/handle_desktop_wrapper_message.rs

@@ -172,5 +172,9 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 				dispatcher.queue_editor_message(message);
 			}
 		}
+		DesktopWrapperMessage::PointerLockMove { x, y } => {
+			let message = AppWindowMessage::PointerLockMove { x, y };
+			dispatcher.queue_editor_message(message);
+		}
 	}
 }

desktop/wrapper/src/intercept_frontend_message.rs

@@ -136,6 +136,9 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
 		FrontendMessage::TriggerClipboardWrite { content } => {
 			dispatcher.respond(DesktopFrontendMessage::ClipboardWrite { content });
 		}
+		FrontendMessage::WindowPointerLock => {
+			dispatcher.respond(DesktopFrontendMessage::PointerLock);
+		}
 		FrontendMessage::WindowClose => {
 			dispatcher.respond(DesktopFrontendMessage::WindowClose);
 		}

desktop/wrapper/src/messages.rs

@@ -65,6 +65,7 @@ pub enum DesktopFrontendMessage {
 	ClipboardWrite {
 		content: String,
 	},
+	PointerLock,
 	WindowClose,
 	WindowMinimize,
 	WindowMaximize,
@@ -132,6 +133,10 @@ pub enum DesktopWrapperMessage {
 	ClipboardReadResult {
 		content: Option<String>,
 	},
+	PointerLockMove {
+		x: f64,
+		y: f64,
+	},
 }
 
 #[derive(Clone, serde::Serialize, serde::Deserialize, Debug)]

editor/build.rs

@@ -18,16 +18,18 @@ fn main() {
 		if !gh.trim().is_empty() {
 			gh.trim().to_string()
 		} else {
-			git_or_unknown(&["rev-parse", "--abbrev-ref", "HEAD"])
+			git(&["rev-parse", "--abbrev-ref", "HEAD"]).unwrap_or_default()
 		}
 	});
 
 	// Instruct Cargo to set environment variables for compile time.
 	// They are accessed with the `env!("GRAPHITE_*")` macro in the codebase.
-	println!("cargo:rustc-env=GRAPHITE_GIT_COMMIT_DATE={commit_date}");
-	println!("cargo:rustc-env=GRAPHITE_GIT_COMMIT_HASH={commit_hash}");
-	println!("cargo:rustc-env=GRAPHITE_GIT_COMMIT_BRANCH={commit_branch}");
 	println!("cargo:rustc-env=GRAPHITE_RELEASE_SERIES={GRAPHITE_RELEASE_SERIES}");
+	if !commit_branch.is_empty() {
+		println!("cargo:rustc-env=GRAPHITE_GIT_COMMIT_BRANCH={commit_branch}");
+	}
+	println!("cargo:rustc-env=GRAPHITE_GIT_COMMIT_HASH={commit_hash}");
+	println!("cargo:rustc-env=GRAPHITE_GIT_COMMIT_DATE={commit_date}");
 }
 
 /// Get an environment variable, or if it is not set or empty, use the provided fallback function. Returns a string with trimmed whitespace.

editor/src/application.rs

@@ -39,19 +39,17 @@ impl Default for Editor {
 }
 
 pub const GRAPHITE_RELEASE_SERIES: &str = env!("GRAPHITE_RELEASE_SERIES");
-pub const GRAPHITE_GIT_COMMIT_DATE: &str = env!("GRAPHITE_GIT_COMMIT_DATE");
+pub const GRAPHITE_GIT_COMMIT_BRANCH: Option<&str> = option_env!("GRAPHITE_GIT_COMMIT_BRANCH");
 pub const GRAPHITE_GIT_COMMIT_HASH: &str = env!("GRAPHITE_GIT_COMMIT_HASH");
-pub const GRAPHITE_GIT_COMMIT_BRANCH: &str = env!("GRAPHITE_GIT_COMMIT_BRANCH");
+pub const GRAPHITE_GIT_COMMIT_DATE: &str = env!("GRAPHITE_GIT_COMMIT_DATE");
 
 pub fn commit_info_localized(localized_commit_date: &str) -> String {
-	format!(
-		"Release Series: {}\n\
-		Branch: {}\n\
-		Commit: {}\n\
-		{}",
-		GRAPHITE_RELEASE_SERIES,
-		GRAPHITE_GIT_COMMIT_BRANCH,
-		GRAPHITE_GIT_COMMIT_HASH.get(..8).unwrap_or(GRAPHITE_GIT_COMMIT_HASH),
-		localized_commit_date
-	)
+	let mut info = String::new();
+	info.push_str(&format!("Release Series: {GRAPHITE_RELEASE_SERIES}\n"));
+	if let Some(branch) = GRAPHITE_GIT_COMMIT_BRANCH {
+		info.push_str(&format!("Branch: {branch}\n"));
+	}
+	info.push_str(&format!("Commit: {}\n", GRAPHITE_GIT_COMMIT_HASH.get(..8).unwrap_or(GRAPHITE_GIT_COMMIT_HASH)));
+	info.push_str(localized_commit_date);
+	info
 }