Differential D15085 Diff 41917 plugins/tools/selectiontools/kis_selection_modifier_mapper.cc

Changeset View

Standalone View

View Options

plugins/tools/selectiontools/kis_selection_modifier_mapper.cc

Context not available.
59 Qt::KeyboardModifiers intersectModifiers; 59​ Qt::KeyboardModifiers intersectModifiers;
60 Qt::KeyboardModifiers addModifiers; 60​ Qt::KeyboardModifiers addModifiers;
61 Qt::KeyboardModifiers subtractModifiers; 61​ Qt::KeyboardModifiers subtractModifiers;
62​ Qt::KeyboardModifiers symmetricdifferenceModifiers;
62}; 63​};
63 64​
64 65​
Context not available.
91{ 92​{
92 KisConfig cfg(true); 93​ KisConfig cfg(true);
93 if (!cfg.switchSelectionCtrlAlt()) { 94​ if (!cfg.switchSelectionCtrlAlt()) {
94 replaceModifiers = Qt::ControlModifier; 95​ replaceModifiers = Qt::AltModifier;
95 intersectModifiers = (Qt::KeyboardModifiers)(Qt::AltModifier | Qt::ShiftModifier); 96​ intersectModifiers = (Qt::KeyboardModifiers)(Qt::AltModifier | Qt::ControlModifier);
96 subtractModifiers = Qt::AltModifier; 97​ subtractModifiers = Qt::ControlModifier;
98​ symmetricdifferenceModifiers = (Qt::KeyboardModifiers)(Qt::AltModifier | Qt::ShiftModifier);
dkazakovUnsubmitted
Done

Did you consult with the painters before changing modifiers?

dkazakov: Did you consult with the painters before changing modifiers?
97 } else { 99​ } else {
98 replaceModifiers = Qt::AltModifier; 100​ replaceModifiers = Qt::AltModifier;
99 intersectModifiers = (Qt::KeyboardModifiers)(Qt::ControlModifier | Qt::ShiftModifier); 101​ intersectModifiers = (Qt::KeyboardModifiers)(Qt::ControlModifier | Qt::ShiftModifier);
100 subtractModifiers = Qt::ControlModifier; 102​ subtractModifiers = Qt::AltModifier;
103​ symmetricdifferenceModifiers = (Qt::KeyboardModifiers)((Qt::ControlModifier | Qt::ShiftModifier)|Qt::AltModifier);
101 } 104​ }
102 105​
103 addModifiers = Qt::ShiftModifier; 106​ addModifiers = Qt::ShiftModifier;
Context not available.
119 newAction = SELECTION_ADD; 122​ newAction = SELECTION_ADD;
120 } else if (m == subtractModifiers) { 123​ } else if (m == subtractModifiers) {
121 newAction = SELECTION_SUBTRACT; 124​ newAction = SELECTION_SUBTRACT;
125​ } else if (m == symmetricdifferenceModifiers) {
126​ newAction = SELECTION_SYMMETRICDIFFERENCE;
122 } 127​ }
128​
123 return newAction; 129​ return newAction;
124} 130​}
Context not available.