Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ libc = "0.2"
rdev = "0.5.3"
objc = "0.2"
objc-foundation = "0.1"
cocoa = "0.22"
thread-priority = "1.2"

# objc 크레이트의 매크로에서 발생하는 cfg 경고 억제
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/capabilities/dmnote-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"identifier": "dmnote-dev",
"description": "Dev server capability (remote URLs are added at runtime by register_dev_capability)",
"local": true,
"windows": ["main", "overlay"],
"webviews": ["main", "overlay"],
"windows": ["main", "overlay", "panel"],
"webviews": ["main", "overlay", "panel"],
"permissions": [
"dmnote-allow-all",
"core:default",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/capabilities/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"identifier": "main",
"description": "Main window capability granting DM Note access",
"local": true,
"windows": ["main", "overlay"],
"windows": ["main", "overlay", "panel"],
"permissions": [
"core:default",
"core:window:allow-start-dragging",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/gen/schemas/acl-manifests.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-tauri/gen/schemas/capabilities.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"dmnote-dev":{"identifier":"dmnote-dev","description":"Dev server capability (remote URLs are added at runtime by register_dev_capability)","local":true,"windows":["main","overlay"],"webviews":["main","overlay"],"permissions":["dmnote-allow-all","core:default","core:window:allow-start-dragging"]},"main":{"identifier":"main","description":"Main window capability granting DM Note access","local":true,"windows":["main","overlay"],"permissions":["core:default","core:window:allow-start-dragging","core:window:allow-current-monitor","core:window:allow-outer-position","core:window:allow-outer-size","core:window:allow-set-position","dmnote-allow-all"]}}
{"dmnote-dev":{"identifier":"dmnote-dev","description":"Dev server capability (remote URLs are added at runtime by register_dev_capability)","local":true,"windows":["main","overlay","panel"],"webviews":["main","overlay","panel"],"permissions":["dmnote-allow-all","core:default","core:window:allow-start-dragging"]},"main":{"identifier":"main","description":"Main window capability granting DM Note access","local":true,"windows":["main","overlay","panel"],"permissions":["core:default","core:window:allow-start-dragging","core:window:allow-current-monitor","core:window:allow-outer-position","core:window:allow-outer-size","core:window:allow-set-position","dmnote-allow-all"]}}
25 changes: 20 additions & 5 deletions src-tauri/permissions/dmnote-allow-all.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,16 @@
"custom_tabs_select",
"editor_commit",
"editor_get",
"editor_history_restore",
"editor_preview_cancel",
"editor_preview_publish",
"editor_preview_subscribe",
"font_load",
"get_cursor_settings",
"graph_positions_get",
"graph_positions_update",
"history_redo",
"history_status",
"history_undo",
"image_load",
"js_get",
"js_get_use",
Expand Down Expand Up @@ -74,12 +79,9 @@
"keys_reset_single_counter",
"keys_set_counters",
"keys_set_mode",
"keys_update",
"keys_update_with_positions",
"knob_positions_get",
"knob_positions_update",
"layer_groups_get",
"layer_groups_update",
"note_tab_clear",
"note_tab_get",
"note_tab_get_all",
Expand All @@ -93,8 +95,20 @@
"overlay_set_anchor",
"overlay_set_lock",
"overlay_set_visible",
"panel_window_close",
"panel_window_close_ack",
"panel_window_is_open",
"panel_window_show",
"panel_window_start_dragging",
"panel_window_take_view_state",
"plugin_authority_reset",
"plugin_bridge_send",
"plugin_bridge_send_to",
"plugin_instances_commit",
"plugin_instances_get",
"plugin_instances_reconcile",
"plugin_rpc_respond",
"plugin_rpc_send",
"plugin_storage_clear",
"plugin_storage_clear_by_prefix",
"plugin_storage_get",
Expand All @@ -103,13 +117,14 @@
"plugin_storage_remove",
"plugin_storage_set",
"positions_get",
"positions_update",
"preset_load",
"preset_load_tab",
"preset_save",
"preset_save_tab",
"raw_input_subscribe",
"raw_input_unsubscribe",
"selection_session_get",
"selection_session_publish",
"settings_get",
"settings_update",
"sound_delete",
Expand Down
14 changes: 11 additions & 3 deletions src-tauri/src/commands/app/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use tauri::{AppHandle, Manager, State, WebviewWindow};

use crate::cursor::{get_macos_cursor_settings, rgb_to_hex};
use crate::errors::CmdResult;
use crate::state::AppState;
use crate::state::{AppState, PANEL_LABEL};

#[tauri::command]
pub fn window_minimize(app: AppHandle) -> CmdResult<()> {
Expand Down Expand Up @@ -58,8 +58,12 @@ pub fn app_quit_after_editor_flush(
}

#[tauri::command]
pub fn app_cancel_editor_flush(state: State<'_, AppState>, handshake_id: String) -> CmdResult<()> {
state.cancel_frontend_lifecycle(&handshake_id);
pub fn app_cancel_editor_flush(
app: AppHandle,
state: State<'_, AppState>,
handshake_id: String,
) -> CmdResult<()> {
state.cancel_frontend_lifecycle(app, &handshake_id);
Ok(())
}

Expand All @@ -73,6 +77,10 @@ pub fn window_open_devtools_all(app: AppHandle) -> CmdResult<()> {
overlay.open_devtools();
let _ = overlay.show();
}
if let Some(panel) = app.get_webview_window(PANEL_LABEL) {
panel.open_devtools();
let _ = panel.show();
}
Ok(())
}

Expand Down
Loading
Loading