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

Changeset View

Standalone View

View Options

plugins/tools/selectiontools/kis_selection_modifier_mapper.cc

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Line(s)
54struct Q_DECL_HIDDEN KisSelectionModifierMapper::Private 54​struct Q_DECL_HIDDEN KisSelectionModifierMapper::Private
55{ 55​{
56 SelectionAction map(Qt::KeyboardModifiers m); 56​ SelectionAction map(Qt::KeyboardModifiers m);
57 void slotConfigChanged(); 57​ void slotConfigChanged();
58 Qt::KeyboardModifiers replaceModifiers; 58​ Qt::KeyboardModifiers replaceModifiers;
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​
65KisSelectionModifierMapper::KisSelectionModifierMapper() 66​KisSelectionModifierMapper::KisSelectionModifierMapper()
66 : m_d(new Private) 67​ : m_d(new Private)
67{ 68​{
68 connect(KisConfigNotifier::instance(), 69​ connect(KisConfigNotifier::instance(),
69 SIGNAL(configChanged()), 70​ SIGNAL(configChanged()),
Show All 16 Lines86{
86 m_d->slotConfigChanged(); 87​ m_d->slotConfigChanged();
87} 88​}
88 89​
89 90​
90void KisSelectionModifierMapper::Private::slotConfigChanged() 91​void KisSelectionModifierMapper::Private::slotConfigChanged()
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::ControlModifier;
dkazakovUnsubmitted
Done

Did you consult with the painters before changing modifiers?

dkazakov: Did you consult with the painters before changing modifiers?
95 intersectModifiers = (Qt::KeyboardModifiers)(Qt::AltModifier | Qt::ShiftModifier); 96​ intersectModifiers = (Qt::KeyboardModifiers)(Qt::AltModifier | Qt::ShiftModifier);
96 subtractModifiers = Qt::AltModifier; 97​ subtractModifiers = Qt::AltModifier;
98​ symmetricdifferenceModifiers = (Qt::KeyboardModifiers)(Qt::ControlModifier | Qt::AltModifier);
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::ControlModifier;
103​ symmetricdifferenceModifiers = (Qt::KeyboardModifiers)(Qt::ShiftModifier | Qt::ControlModifier);
101 } 104​ }
102 105​
103 addModifiers = Qt::ShiftModifier; 106​ addModifiers = Qt::ShiftModifier;
104} 107​}
105 108​
106SelectionAction KisSelectionModifierMapper::map(Qt::KeyboardModifiers m) 109​SelectionAction KisSelectionModifierMapper::map(Qt::KeyboardModifiers m)
107{ 110​{
108 return s_instance->m_d->map(m); 111​ return s_instance->m_d->map(m);
109} 112​}
110 113​
111SelectionAction KisSelectionModifierMapper::Private::map(Qt::KeyboardModifiers m) 114​SelectionAction KisSelectionModifierMapper::Private::map(Qt::KeyboardModifiers m)
112{ 115​{
113 SelectionAction newAction = SELECTION_DEFAULT; 116​ SelectionAction newAction = SELECTION_DEFAULT;
114 if (m == replaceModifiers) { 117​ if (m == replaceModifiers) {
115 newAction = SELECTION_REPLACE; 118​ newAction = SELECTION_REPLACE;
116 } else if (m == intersectModifiers) { 119​ } else if (m == intersectModifiers) {
117 newAction = SELECTION_INTERSECT; 120​ newAction = SELECTION_INTERSECT;
118 } else if (m == addModifiers) { 121​ } else if (m == addModifiers) {
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​}