diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:47 +0000 |
| commit | 839c46e19ac4aa00b619a185ad48ee977162ef2c (patch) | |
| tree | 01f1e79a4e164244941361adb0cf062098537f12 /app/widgets | |
| parent | Adding debian version 2.10.36-3. (diff) | |
| download | gimp-839c46e19ac4aa00b619a185ad48ee977162ef2c.tar.xz gimp-839c46e19ac4aa00b619a185ad48ee977162ef2c.zip | |
Merging upstream version 2.10.38.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'app/widgets')
| -rw-r--r-- | app/widgets/gimpaction-history.c | 1 | ||||
| -rw-r--r-- | app/widgets/gimpdashboard.c | 7 | ||||
| -rw-r--r-- | app/widgets/gimpdeviceinfo.c | 18 |
3 files changed, 24 insertions, 2 deletions
diff --git a/app/widgets/gimpaction-history.c b/app/widgets/gimpaction-history.c index 37cdc03..57ac1bf 100644 --- a/app/widgets/gimpaction-history.c +++ b/app/widgets/gimpaction-history.c @@ -319,6 +319,7 @@ gimp_action_history_is_blacklisted_action (const gchar *action_name) return (g_str_has_suffix (action_name, "-set") || g_str_has_suffix (action_name, "-accel") || + g_str_has_suffix (action_name, "-internal") || g_str_has_prefix (action_name, "context-") || g_str_has_prefix (action_name, "filters-recent-") || g_strcmp0 (action_name, "dialogs-action-search") == 0); diff --git a/app/widgets/gimpdashboard.c b/app/widgets/gimpdashboard.c index 8e8273b..5b55b37 100644 --- a/app/widgets/gimpdashboard.c +++ b/app/widgets/gimpdashboard.c @@ -2420,6 +2420,13 @@ gimp_dashboard_sample_cpu_active_time (GimpDashboard *dashboard, #ifdef HAVE_MEMORY_GROUP #ifdef PLATFORM_OSX + #if MAC_OS_X_VERSION_MAX_ALLOWED < 1080 + #define MACH_TASK_BASIC_INFO_COUNT TASK_BASIC_INFO_COUNT + #define mach_task_basic_info_data_t task_basic_info_data_t + + #define MACH_TASK_BASIC_INFO TASK_BASIC_INFO + #define mach_task_basic_info task_basic_info + #endif static void gimp_dashboard_sample_memory_used (GimpDashboard *dashboard, Variable variable) diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c index 594dd90..053af61 100644 --- a/app/widgets/gimpdeviceinfo.c +++ b/app/widgets/gimpdeviceinfo.c @@ -80,7 +80,6 @@ G_DEFINE_TYPE (GimpDeviceInfo, gimp_device_info, GIMP_TYPE_TOOL_PRESET) #define parent_class gimp_device_info_parent_class - static void gimp_device_info_class_init (GimpDeviceInfoClass *klass) { @@ -535,8 +534,23 @@ gimp_device_info_set_device (GimpDeviceInfo *info, * Also we had no clear report on macOS or BSD (AFAIK) of broken * tablets with any of the version of the code. So let's keep * these similar to Linux for now. + * + * Update: it's not needed for Windows Ink, only Wintab. */ - return FALSE; + { + Gimp *gimp = NULL; + + g_object_get (info, "gimp", &gimp, NULL); + if (gimp) + { + GimpWin32PointerInputAPI api = GIMP_WIN32_POINTER_INPUT_API_WINTAB; + + g_object_get (gimp->config, "win32-pointer-input-api", &api, NULL); + + if (api == GIMP_WIN32_POINTER_INPUT_API_WINTAB) + return FALSE; + } + } #endif /* G_OS_WIN32 */ } else if (! device && ! info->device) |