YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-11-11 02:06:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] preserve macOS permissions and defer legacy migration to launch

Browse Source
This commit is contained in:
dijunkun
2026-11-07 03:07:24 +08:00
parent 458f9ef58d
commit f5f8eb94d4
17 changed files with 613 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/desktop/src/gui/application/gui_application.cpp
+33 -2
View File
@@ -1173,6 +1173,9 @@ int GuiApplication::Run() {
"announcement_reads");
config_center_ = std::make_unique<ConfigCenter>(cache_path_ + "/config.ini");
InitializeTrustedDevices(path_manager_->GetConfigPath() / "trusted-devices");
#ifdef __APPLE__
StartMacPermissionMigration(false);
#endif
LOG_INFO("CrossDesk version: {} (Slint UI)", CROSSDESK_VERSION);
@@ -2080,6 +2083,26 @@ void GuiApplication::BindMainCallbacks(bool gallery_window) {
props->rejoin_ = true;
need_to_rejoin_ = true;
});
main->on_open_permissions([this, main] {
#ifdef __APPLE__
mac_permission_dialog_dismissed_ = false;
mac_permission_dialog_requested_ = true;
show_request_permission_window_ = true;
if (main->get_gallery_mode()) ShowMainWindow();
#endif
});
main->on_dismiss_permissions([this] {
#ifdef __APPLE__
mac_permission_dialog_dismissed_ = true;
mac_permission_dialog_requested_ = false;
show_request_permission_window_ = false;
#endif
});
main->on_retry_permission_migration([this] {
#ifdef __APPLE__
StartMacPermissionMigration(true);
#endif
});
main->on_request_screen_recording_permission([this] {
#ifdef __APPLE__
OpenScreenRecordingPreferences();
@@ -3617,8 +3640,16 @@ void GuiApplication::SyncPlatformDialogs() {
#endif
#ifdef __APPLE__
RefreshMacPermissionStatus(false);
show_request_permission_window_ = !mac_screen_recording_permission_granted_ ||
!mac_accessibility_permission_granted_;
const bool migration_running = mac_permission_migration_task_.valid();
const bool permissions_pending = migration_running ||
mac_permission_migration_failed_ || !mac_screen_recording_permission_granted_ ||
!mac_accessibility_permission_granted_;
show_request_permission_window_ = !mac_permission_dialog_dismissed_ &&
(mac_permission_dialog_requested_ || permissions_pending);
ui_->main->set_mac_permission_settings_visible(true);
ui_->wall->set_mac_permission_settings_visible(true);
ui_->main->set_permission_migration_running(migration_running);
ui_->main->set_permission_migration_failed(mac_permission_migration_failed_);
ui_->main->set_permission_dialog_open(show_request_permission_window_);
ui_->main->set_screen_recording_granted(
mac_screen_recording_permission_granted_);