northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #101546 from bruvzg/portal_color_picker

Browse Source 
[Linux] Implement native color picker.
This commit is contained in:
Thaddeus Crews
2025-03-17 10:52:29 -05:00
parent 9cf741a315 05ca80632d
commit 49fcd4ce46
11 changed files with 348 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
platform/linuxbsd/freedesktop_portal_desktop.h
View File

@ -59,6 +59,23 @@ private:
static void append_dbus_dict_string(DBusMessageIter *p_iter, const String &p_key, const String &p_value, bool p_as_byte_array = false);
static void append_dbus_dict_bool(DBusMessageIter *p_iter, const String &p_key, bool p_value);
static bool file_chooser_parse_response(DBusMessageIter *p_iter, const Vector<String> &p_names, const HashMap<String, String> &p_ids, bool &r_cancel, Vector<String> &r_urls, int &r_index, Dictionary &r_options);
static bool color_picker_parse_response(DBusMessageIter *p_iter, bool &r_cancel, Color &r_color);
struct ColorPickerData {
Callable callback;
String filter;
String path;
};
struct ColorPickerCallback {
Callable callback;
Variant status;
Variant color;
};
List<ColorPickerCallback> pending_color_cbs;
Mutex color_picker_mutex;
Vector<ColorPickerData> color_pickers;
struct FileDialogData {
Vector<String> filter_names;
@ -78,7 +95,7 @@ private:
Variant options;
bool opt_in_cb = false;
};
List<FileDialogCallback> pending_cbs;
List<FileDialogCallback> pending_file_cbs;
Mutex file_dialog_mutex;
Vector<FileDialogData> file_dialogs;
@ -100,11 +117,11 @@ public:
bool is_supported() { return !unsupported; }
bool is_file_chooser_supported();
bool is_settings_supported();
bool is_screenshot_supported();
// org.freedesktop.portal.FileChooser methods.
Error file_dialog_show(DisplayServer::WindowID p_window_id, const String &p_xid, const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, DisplayServer::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb);
void process_file_dialog_callbacks();
void process_callbacks();
// org.freedesktop.portal.Settings methods.
@ -117,6 +134,9 @@ public:
void set_system_theme_change_callback(const Callable &p_system_theme_changed) {
system_theme_changed = p_system_theme_changed;
}
// org.freedesktop.portal.Screenshot methods.
bool color_picker(const String &p_xid, const Callable &p_callback);
};
#endif // DBUS_ENABLED