callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "app: fix #12475 Eraser tip uses same tool as pen tip"

Browse Source 
This reverts commit 68422e3c70.
This commit is contained in:
Jacob Boerema 2025-03-23 13:08:22 -04:00
parent b3e3241c6f
commit 5f7a136685
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/widgets/gimpdeviceinfo.c
View File

@ -866,17 +866,13 @@ gimp_device_info_set_device (GimpDeviceInfo *info,
"which already has a device\n", "which already has a device\n",
G_STRFUNC, gdk_device_get_name (device)); G_STRFUNC, gdk_device_get_name (device));
/* We had breakage because of duplicate devices, fixed by #ifdef G_OS_WIN32
* overwriting the info's old device (assuming it to be /* This is a very weird/dirty difference we make between Win32 and
* dead) with the new one. * Linux. On Linux, we had breakage because of duplicate devices,
* * fixed by overwriting the info's old device (assuming it to be
* Previously, see #2495, there was an exception made for Windows, * dead) with the new one. Unfortunately doing this on Windows
* due to breaking a lot of devices. However, it seems that things * too broke a lot of devices (which used to work with the old
* on Windows changed, since we had a new issue #12475 where * way). See the regression bug #2495.
* returning early here caused devices not to be recognized
* separately. Which is the reason that we now remove this
* Windows only exception and hope this now works across all
* platforms and devices.
* *
* NOTE that this only happens if something is wrong on the USB * NOTE that this only happens if something is wrong on the USB
* or udev or libinput or whatever side and the same device is * or udev or libinput or whatever side and the same device is
@ -884,7 +880,12 @@ gimp_device_info_set_device (GimpDeviceInfo *info,
* absolute single "solution" to this problem (well there is, but * absolute single "solution" to this problem (well there is, but
* probably not in GIMP, where we can only react). This is more * probably not in GIMP, where we can only react). This is more
* of an experimenting-in-real-life kind of bug. * of an experimenting-in-real-life kind of bug.
* 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.
*/ */
return FALSE;
#endif /* G_OS_WIN32 */
} }
else if (! device && ! info->priv->device) else if (! device && ! info->priv->device)
{ {