Skip to content

Fix bug in "sample screen color" action when it was initiated multiple times without completing

Deif Lou requested to merge deiflou/krita:deiflou/fix_screen_color_sampling_action into master

Bug reported here: https://krita-artists.org/t/sample-screen-color-tool-wont-stop-colorpicking/89431 and here https://bugs.kde.org/show_bug.cgi?id=485739

On windows, it seems that the screen sampling system was confused when the action was initiated multiple times without actually selecting a color between each activation (i.e. pressing the shortcut for the action twice without clicking to select a screen color, or pressing esc to cancel, between the two activations).

Before, multiple KisScreenColorSampler objects may be created and alive at the same time, thus provoking confusion in the actions. Now, when the action is triggered, if there is a KisScreenColorSampler object alive (another sampling action was started but not yet completed), its cancel method is called (which will ultimately end up on the widget being closed). So the shortcut now acts like an "on/off" switch for the screen sampling operation. Actually, there are two actions for screen sampling: one samples the raw screen pixels, and the other tries to sample the real colors in the canvas (like the sampler on the "select color" dialog). So if the new sampling action is different than the old one, the old KisScreenColorSampler is still cancelled/closed/deleted, but in this case a new KisScreenColorSampler is created.

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.

Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build. If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.

Merge request reports