fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-15 22:28:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

mac use option as alt

Browse Source
This commit is contained in:
Timon Schelling
2025-11-11 23:35:20 +01:00
parent 095a5040b8
commit f7c2f75088
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
desktop/src/window/mac.rs
View File

@@ -1,5 +1,6 @@
use winit::event_loop::ActiveEventLoop;
use winit::window::{Window, WindowAttributes};
use winit::platform::macos::{OptionAsAlt, WindowAttributesMacOS};
use crate::consts::APP_NAME;
use crate::event::AppEventScheduler;
@@ -11,10 +12,11 @@ pub(super) struct NativeWindowImpl {
impl super::NativeWindow for NativeWindowImpl {
fn configure(attributes: WindowAttributes, _event_loop: &dyn ActiveEventLoop) -> WindowAttributes {
let mac_window = winit::platform::macos::WindowAttributesMacOS::default()
let mac_window = WindowAttributesMacOS::default()
.with_titlebar_transparent(true)
.with_fullsize_content_view(true)
.with_title_hidden(true);
.with_title_hidden(true)
.with_option_as_alt(OptionAsAlt::Both);
attributes.with_platform_attributes(Box::new(mac_window))
}

6
desktop/src/window/win.rs
View File

@@ -1,4 +1,6 @@
use winit::event_loop::ActiveEventLoop;
use winit::icon::Icon;
use winit::platform::windows::WinIcon;
use winit::window::{Window, WindowAttributes};
use crate::event::AppEventScheduler;
@@ -9,8 +11,8 @@ pub(super) struct NativeWindowImpl {
impl super::NativeWindow for NativeWindowImpl {
fn configure(attributes: WindowAttributes, _event_loop: &dyn ActiveEventLoop) -> WindowAttributes {
if let Ok(win_icon) = winit::platform::windows::WinIcon::from_resource(1, None) {
let icon = winit::icon::Icon(std::sync::Arc::new(win_icon));
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