Own grid workers and thin Apple platform bridge
This commit is contained in:
@@ -6,11 +6,6 @@
|
||||
#include <array>
|
||||
#include <utility>
|
||||
|
||||
#if defined(__IOS__) || defined(__OSX__)
|
||||
#include "app_core/app.h"
|
||||
#include <dispatch/dispatch.h>
|
||||
#endif
|
||||
|
||||
namespace pp::platform::apple {
|
||||
namespace {
|
||||
|
||||
@@ -54,26 +49,16 @@ std::vector<std::string> AppleDocumentPlatformServices::document_browse_roots(
|
||||
|
||||
std::string AppleDocumentPlatformServices::clipboard_text() const
|
||||
{
|
||||
#if defined(__IOS__)
|
||||
return [App::I->ios_view clipboard_get_string];
|
||||
#elif defined(__OSX__)
|
||||
return [App::I->osx_view clipboard_get_string];
|
||||
#else
|
||||
if (bridge_.clipboard_text)
|
||||
return bridge_.clipboard_text();
|
||||
return {};
|
||||
#endif
|
||||
}
|
||||
|
||||
bool AppleDocumentPlatformServices::set_clipboard_text(std::string_view text) const
|
||||
{
|
||||
const std::string value(text);
|
||||
#if defined(__IOS__)
|
||||
return [App::I->ios_view clipboard_set_string:value];
|
||||
#elif defined(__OSX__)
|
||||
return [App::I->osx_view clipboard_set_string:value];
|
||||
#else
|
||||
(void)value;
|
||||
if (bridge_.set_clipboard_text)
|
||||
return bridge_.set_clipboard_text(text);
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
void AppleDocumentPlatformServices::pick_image(PickedPathCallback callback) const
|
||||
@@ -158,9 +143,8 @@ void AppleDocumentPlatformServices::display_file(std::string_view path) const
|
||||
{
|
||||
const std::string value(path);
|
||||
#if defined(__IOS__)
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[App::I->ios_view display_file:value];
|
||||
});
|
||||
if (bridge_.display_file)
|
||||
bridge_.display_file(value);
|
||||
#elif defined(__OSX__)
|
||||
[[NSWorkspace sharedWorkspace] openFile:[NSString stringWithUTF8String:value.c_str()]];
|
||||
#else
|
||||
@@ -171,14 +155,9 @@ void AppleDocumentPlatformServices::display_file(std::string_view path) const
|
||||
void AppleDocumentPlatformServices::share_file(std::string_view path) const
|
||||
{
|
||||
const std::string value(path);
|
||||
#if defined(__IOS__)
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[App::I->ios_view share_file:[NSString stringWithUTF8String:value.c_str()]];
|
||||
});
|
||||
#elif defined(__OSX__)
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[App::I->osx_view share_file:[NSString stringWithUTF8String:value.c_str()]];
|
||||
});
|
||||
#if defined(__IOS__) || defined(__OSX__)
|
||||
if (bridge_.share_file)
|
||||
bridge_.share_file(value);
|
||||
#else
|
||||
(void)value;
|
||||
#endif
|
||||
@@ -187,7 +166,8 @@ void AppleDocumentPlatformServices::share_file(std::string_view path) const
|
||||
void AppleDocumentPlatformServices::set_cursor_visible(bool visible) const
|
||||
{
|
||||
#if defined(__OSX__)
|
||||
[App::I->osx_view show_cursor:visible];
|
||||
if (bridge_.set_cursor_visible)
|
||||
bridge_.set_cursor_visible(visible);
|
||||
#else
|
||||
(void)visible;
|
||||
#endif
|
||||
@@ -196,7 +176,8 @@ void AppleDocumentPlatformServices::set_cursor_visible(bool visible) const
|
||||
void AppleDocumentPlatformServices::save_ui_state() const
|
||||
{
|
||||
#if defined(__OSX__)
|
||||
[App::I->osx_app save_ui_state];
|
||||
if (bridge_.save_ui_state)
|
||||
bridge_.save_ui_state();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -16,6 +16,12 @@ struct AppleDocumentPickerBridge {
|
||||
std::function<void(std::vector<std::string> file_types, PickedPathCallback callback)> pick_save_file;
|
||||
std::function<void(PickedPathCallback callback)> pick_directory;
|
||||
std::function<std::string(std::string_view path)> format_working_directory_path;
|
||||
std::function<std::string()> clipboard_text;
|
||||
std::function<bool(std::string_view text)> set_clipboard_text;
|
||||
std::function<void(std::string path)> display_file;
|
||||
std::function<void(std::string path)> share_file;
|
||||
std::function<void(bool visible)> set_cursor_visible;
|
||||
std::function<void()> save_ui_state;
|
||||
};
|
||||
|
||||
class AppleDocumentPlatformServices {
|
||||
|
||||
Reference in New Issue
Block a user