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

Desktop: Mac native menu bar (#3301)

Browse Source 
* macos native menu bar

* fix nix build

* Add shortcut symbols to menu

* fix fmt

* fix vendoring

* cleanup intercept frontend message

* accept into editor message in queue function
This commit is contained in:
Timon
2025-10-27 14:11:24 +00:00
committed by GitHub
parent 6ca25e4ea9
commit 5be9b1fabc
22 changed files with 458 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/src/app.rs
+11 -3
View File
@@ -19,8 +19,8 @@ use crate::event::{AppEvent, AppEventScheduler};
use crate::persist::PersistentData;
use crate::render::GraphicsState;
use crate::window::Window;
use graphite_desktop_wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage, Platform};
use graphite_desktop_wrapper::{DesktopWrapper, NodeGraphExecutionResult, WgpuContext, serialize_frontend_messages};
use crate::wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage, Platform};
use crate::wrapper::{DesktopWrapper, NodeGraphExecutionResult, WgpuContext, serialize_frontend_messages};
pub(crate) struct App {
cef_context: Box<dyn cef::CefContext>,
@@ -258,6 +258,11 @@ impl App {
}
});
}
DesktopFrontendMessage::UpdateMenu { entries } => {
if let Some(window) = &self.window {
window.update_menu(entries);
}
}
}
}
@@ -338,12 +343,15 @@ impl App {
tracing::info!("Exiting main event loop");
event_loop.exit();
}
AppEvent::MenuEvent { id } => {
self.dispatch_desktop_wrapper_message(DesktopWrapperMessage::MenuEvent { id });
}
}
}
}
impl ApplicationHandler for App {
fn can_create_surfaces(&mut self, event_loop: &dyn ActiveEventLoop) {
let window = Window::new(event_loop);
let window = Window::new(event_loop, self.app_event_scheduler.clone());
self.window = Some(window);
let graphics_state = GraphicsState::new(self.window.as_ref().unwrap(), self.wgpu_context.clone());