Merge branch 'master' into add-median-filter-blur

Author: youssefelzedy

desktop/bundle/src/common.rs

@@ -5,6 +5,10 @@ use std::process::{Command, Stdio};
 
 pub(crate) const APP_NAME: &str = "Graphite";
 
+pub(crate) fn workspace_path() -> PathBuf {
+	PathBuf::from(env!("CARGO_WORKSPACE_DIR"))
+}
+
 fn profile_name() -> &'static str {
 	let mut profile = env!("CARGO_PROFILE");
 	if profile == "debug" {
@@ -14,7 +18,7 @@ fn profile_name() -> &'static str {
 }
 
 pub(crate) fn profile_path() -> PathBuf {
-	PathBuf::from(env!("CARGO_WORKSPACE_DIR")).join(format!("target/{}", env!("CARGO_PROFILE")))
+	workspace_path().join(format!("target/{}", env!("CARGO_PROFILE")))
 }
 
 pub(crate) fn cef_path() -> PathBuf {

desktop/bundle/src/mac.rs

@@ -10,9 +10,12 @@ const APP_ID: &str = "rs.graphite.Graphite";
 const PACKAGE: &str = "graphite-desktop-platform-mac";
 const HELPER_BIN: &str = "graphite-desktop-platform-mac-helper";
 
+const ICONS_FILE_NAME: &str = "graphite.icns";
+
 const EXEC_PATH: &str = "Contents/MacOS";
 const FRAMEWORKS_PATH: &str = "Contents/Frameworks";
-const FRAMEWORK: &str = "Chromium Embedded Framework.framework";
+const RESOURCES_PATH: &str = "Contents/Resources";
+const CEF_FRAMEWORK: &str = "Chromium Embedded Framework.framework";
 
 pub fn main() -> Result<(), Box<dyn Error>> {
 	let app_bin = build_bin(PACKAGE, None)?;
@@ -46,7 +49,13 @@ fn bundle(out_dir: &Path, app_bin: &Path, helper_bin: &Path) -> PathBuf {
 		create_app(&helper_app_dir, &helper_id, &helper_name, helper_bin, true);
 	}
 
-	copy_dir(&cef_path().join(FRAMEWORK), &app_dir.join(FRAMEWORKS_PATH).join(FRAMEWORK));
+	copy_dir(&cef_path().join(CEF_FRAMEWORK), &app_dir.join(FRAMEWORKS_PATH).join(CEF_FRAMEWORK));
+
+	let resource_dir = app_dir.join(RESOURCES_PATH);
+	fs::create_dir_all(&resource_dir).expect("failed to create app resource dir");
+
+	let icon_file = workspace_path().join("branding/app-icons").join(ICONS_FILE_NAME);
+	fs::copy(icon_file, resource_dir.join(ICONS_FILE_NAME)).expect("failed to copy icon file");
 
 	app_dir
 }
@@ -61,25 +70,22 @@ fn create_app(app_dir: &Path, id: &str, name: &str, bin: &Path, is_helper: bool)
 
 fn create_info_plist(dir: &Path, id: &str, exec_name: &str, is_helper: bool) -> Result<(), Box<dyn std::error::Error>> {
 	let info = InfoPlist {
-		cf_bundle_development_region: "en".to_string(),
+		cf_bundle_name: exec_name.to_string(),
+		cf_bundle_identifier: id.to_string(),
 		cf_bundle_display_name: exec_name.to_string(),
 		cf_bundle_executable: exec_name.to_string(),
-		cf_bundle_identifier: id.to_string(),
+		cf_bundle_icon_file: ICONS_FILE_NAME.to_string(),
 		cf_bundle_info_dictionary_version: "6.0".to_string(),
-		cf_bundle_name: exec_name.to_string(),
 		cf_bundle_package_type: "APPL".to_string(),
 		cf_bundle_signature: "????".to_string(),
 		cf_bundle_version: "0.0.0".to_string(),
 		cf_bundle_short_version_string: "0.0".to_string(),
+		cf_bundle_development_region: "en".to_string(),
 		ls_environment: [("MallocNanoZone".to_string(), "0".to_string())].iter().cloned().collect(),
 		ls_file_quarantine_enabled: true,
 		ls_minimum_system_version: "11.0".to_string(),
 		ls_ui_element: if is_helper { Some("1".to_string()) } else { None },
-		ns_bluetooth_always_usage_description: exec_name.to_string(),
 		ns_supports_automatic_graphics_switching: true,
-		ns_web_browser_publickey_credential_usage_description: exec_name.to_string(),
-		ns_camera_usage_description: exec_name.to_string(),
-		ns_microphone_usage_description: exec_name.to_string(),
 	};
 
 	let plist_file = dir.join("Info.plist");
@@ -89,18 +95,18 @@ fn create_info_plist(dir: &Path, id: &str, exec_name: &str, is_helper: bool) ->
 
 #[derive(serde::Serialize)]
 struct InfoPlist {
-	#[serde(rename = "CFBundleDevelopmentRegion")]
-	cf_bundle_development_region: String,
+	#[serde(rename = "CFBundleName")]
+	cf_bundle_name: String,
+	#[serde(rename = "CFBundleIdentifier")]
+	cf_bundle_identifier: String,
 	#[serde(rename = "CFBundleDisplayName")]
 	cf_bundle_display_name: String,
 	#[serde(rename = "CFBundleExecutable")]
 	cf_bundle_executable: String,
-	#[serde(rename = "CFBundleIdentifier")]
-	cf_bundle_identifier: String,
+	#[serde(rename = "CFBundleIconFile")]
+	cf_bundle_icon_file: String,
 	#[serde(rename = "CFBundleInfoDictionaryVersion")]
 	cf_bundle_info_dictionary_version: String,
-	#[serde(rename = "CFBundleName")]
-	cf_bundle_name: String,
 	#[serde(rename = "CFBundlePackageType")]
 	cf_bundle_package_type: String,
 	#[serde(rename = "CFBundleSignature")]
@@ -109,6 +115,8 @@ struct InfoPlist {
 	cf_bundle_version: String,
 	#[serde(rename = "CFBundleShortVersionString")]
 	cf_bundle_short_version_string: String,
+	#[serde(rename = "CFBundleDevelopmentRegion")]
+	cf_bundle_development_region: String,
 	#[serde(rename = "LSEnvironment")]
 	ls_environment: HashMap<String, String>,
 	#[serde(rename = "LSFileQuarantineEnabled")]
@@ -117,14 +125,6 @@ struct InfoPlist {
 	ls_minimum_system_version: String,
 	#[serde(rename = "LSUIElement")]
 	ls_ui_element: Option<String>,
-	#[serde(rename = "NSBluetoothAlwaysUsageDescription")]
-	ns_bluetooth_always_usage_description: String,
 	#[serde(rename = "NSSupportsAutomaticGraphicsSwitching")]
 	ns_supports_automatic_graphics_switching: bool,
-	#[serde(rename = "NSWebBrowserPublicKeyCredentialUsageDescription")]
-	ns_web_browser_publickey_credential_usage_description: String,
-	#[serde(rename = "NSCameraUsageDescription")]
-	ns_camera_usage_description: String,
-	#[serde(rename = "NSMicrophoneUsageDescription")]
-	ns_microphone_usage_description: String,
 }

desktop/src/cef/internal/browser_process_app.rs

@@ -33,6 +33,16 @@ impl<H: CefEventHandler> ImplApp for BrowserProcessAppImpl<H> {
 
 	fn on_before_command_line_processing(&self, _process_type: Option<&cef::CefString>, command_line: Option<&mut cef::CommandLine>) {
 		if let Some(cmd) = command_line {
+			cmd.append_switch_with_value(Some(&CefString::from("renderer-process-limit")), Some(&CefString::from("1")));
+			cmd.append_switch_with_value(Some(&CefString::from("disk-cache-size")), Some(&CefString::from("0")));
+			cmd.append_switch(Some(&CefString::from("incognito")));
+			cmd.append_switch(Some(&CefString::from("no-first-run")));
+			cmd.append_switch(Some(&CefString::from("disable-file-system")));
+			cmd.append_switch(Some(&CefString::from("disable-local-storage")));
+			cmd.append_switch(Some(&CefString::from("disable-background-networking")));
+			cmd.append_switch(Some(&CefString::from("disable-audio-input")));
+			cmd.append_switch(Some(&CefString::from("disable-audio-output")));
+
 			#[cfg(not(feature = "accelerated_paint"))]
 			{
 				// Disable GPU acceleration when accelerated_paint feature is not enabled

desktop/src/window/win.rs

@@ -1,6 +1,7 @@
+use winit::dpi::PhysicalSize;
 use winit::event_loop::ActiveEventLoop;
 use winit::icon::Icon;
-use winit::platform::windows::WinIcon;
+use winit::platform::windows::{WinIcon, WindowAttributesWindows};
 use winit::window::{Window, WindowAttributes};
 
 use crate::event::AppEventScheduler;
@@ -11,12 +12,10 @@ pub(super) struct NativeWindowImpl {
 
 impl super::NativeWindow for NativeWindowImpl {
 	fn configure(attributes: WindowAttributes, _event_loop: &dyn ActiveEventLoop) -> WindowAttributes {
-		if let Ok(win_icon) = WinIcon::from_resource(1, None) {
-			let icon = Icon(std::sync::Arc::new(win_icon));
-			attributes.with_window_icon(Some(icon))
-		} else {
-			attributes
-		}
+		let icon = WinIcon::from_resource(1, Some(PhysicalSize::new(256, 256))).ok().map(|icon| Icon(std::sync::Arc::new(icon)));
+		let win_window = WindowAttributesWindows::default().with_taskbar_icon(icon);
+		let icon = WinIcon::from_resource(1, None).ok().map(|icon| Icon(std::sync::Arc::new(icon)));
+		attributes.with_window_icon(icon).with_platform_attributes(Box::new(win_window))
 	}
 
 	fn new(window: &dyn Window, _app_event_scheduler: AppEventScheduler) -> Self {

editor/src/messages/portfolio/document/data_panel/data_panel_message_handler.rs

@@ -502,10 +502,17 @@ impl TableRowLayout for Raster<CPU> {
 		format!("Raster ({}x{})", self.width, self.height)
 	}
 	fn element_page(&self, _data: &mut LayoutData) -> Vec<LayoutGroup> {
-		let base64_string = self.data().base64_string.clone().unwrap_or_else(|| {
+		let raster = self.data();
+
+		if raster.width == 0 || raster.height == 0 {
+			let widgets = vec![TextLabel::new("Image has no area").widget_holder()];
+			return vec![LayoutGroup::Row { widgets }];
+		}
+
+		let base64_string = raster.base64_string.clone().unwrap_or_else(|| {
 			use base64::Engine;
 
-			let output = self.data().to_png();
+			let output = raster.to_png();
 			let preamble = "data:image/png;base64,";
 			let mut base64_string = String::with_capacity(preamble.len() + output.len() * 4);
 			base64_string.push_str(preamble);