Differential D17793 Diff 48214 libs/ui/input/kis_stroke_shortcut.cpp

Changeset View

Standalone View

View Options

libs/ui/input/kis_stroke_shortcut.cpp

Context not available.
22 22​
23#include <QMouseEvent> 23​#include <QMouseEvent>
24 24​
25​#include <cmath>
25 26​
26class Q_DECL_HIDDEN KisStrokeShortcut::Private 27​class Q_DECL_HIDDEN KisStrokeShortcut::Private
27{ 28​{
Context not available.
44 45​
45int KisStrokeShortcut::priority() const 46​int KisStrokeShortcut::priority() const
46{ 47​{
47 int buttonScore = 0; 48​ Qt::MouseButtons buttons { 0 };
48 Q_FOREACH (Qt::MouseButton button, m_d->buttons) { 49​ Q_FOREACH (Qt::MouseButton button, m_d->buttons) {
dkazakovUnsubmitted
Done

Just use logarithm-base-2 instead of raw number. You can also use DeBruijn32 algorithm for that if you like :)

https://stackoverflow.com/questions/2589096/find-most-significant-bit-left-most-that-is-set-in-a-bit-array

dkazakov: Just use logarithm-base-2 instead of raw number. You can also use DeBruijn32 algorithm for that…
49 buttonScore += Qt::XButton2 - button; 50​ buttons |= button;
51​ }
52​ int buttonScore = Qt::AllButtons - buttons;
53​ if (buttonScore) {
54​ buttonScore = std::round(std::log2(buttonScore));
dkazakovUnsubmitted
Not Done

I guess this is the reason of the cursor bug. Logarithm is not linear relative to its argument, so you should calculate it separately: for the max value and for the currentbutton's one:

const int maxScore = std::log(Qt::MaxMouseButton);
// ...
buttonScore += maxScore - std::log2(button);

I guess this will solve the cursor issue

dkazakov: I guess this is the reason of the cursor bug. Logarithm is not linear relative to its argument…
50 } 55​ }
51 56​
52 return m_d->modifiers.size() * 0xFFFF + buttonScore * 0xFF + action()->priority(); 57​ return m_d->modifiers.size() * 0xFFFF + buttonScore * 0xFF + action()->priority();
Context not available.