Differential D15085 Diff 41558 libs/ui/tool/kis_selection_tool_helper.cpp

Changeset View

Standalone View

View Options

libs/ui/tool/kis_selection_tool_helper.cpp

Context not available.
105 105​
106 KisSelectionTransaction transaction(pixelSelection); 106​ KisSelectionTransaction transaction(pixelSelection);
107 107​
108 if (!hasSelection && m_action == SELECTION_SUBTRACT) { 108​ if (!hasSelection && m_action == SELECTION_SYMMETRICDIFFERENCE) {
109 pixelSelection->invert(); 109​ pixelSelection->invert();
110 } 110​ }
111 111​
112 pixelSelection->applySelection(m_selection, m_action); 112​ pixelSelection->applySelection(m_selection, m_action);
113 113​
114 QRect dirtyRect = m_view->image()->bounds(); 114​ QRect dirtyRect = m_view->image()->bounds();
115 if (hasSelection && m_action != SELECTION_REPLACE && m_action != SELECTION_INTERSECT) { 115​ if (hasSelection && m_action != SELECTION_REPLACE && m_action != SELECTION_SYMMETRICDIFFERENCE) {
116 dirtyRect = m_selection->selectedRect(); 116​ dirtyRect = m_selection->selectedRect();
117 } 117​ }
118 m_view->selection()->updateProjection(dirtyRect); 118​ m_view->selection()->updateProjection(dirtyRect);
Context not available.
226 case SELECTION_SUBTRACT: 226​ case SELECTION_SUBTRACT:
227 path = path1 - path2; 227​ path = path1 - path2;
228 break; 228​ break;
229​ case SELECTION_SYMMETRICDIFFERENCE:
230​ path = (path1 | path2) - (path1 & path2);
231​ break;
229 } 232​ }
230 233​
231 KoShape *newShape = KoPathShape::createShapeFromPainterPath(path); 234​ KoShape *newShape = KoPathShape::createShapeFromPainterPath(path);
Context not available.
266 269​
267bool KisSelectionToolHelper::canShortcutToDeselect(const QRect &rect, SelectionAction action) 270​bool KisSelectionToolHelper::canShortcutToDeselect(const QRect &rect, SelectionAction action)
268{ 271​{
269 return rect.isEmpty() && (action == SELECTION_INTERSECT || action == SELECTION_REPLACE); 272​ return rect.isEmpty() && (action == SELECTION_SYMMETRICDIFFERENCE || action == SELECTION_REPLACE);
dkazakovUnsubmitted
Done

Is it correct that INTERSECT is not a part of the condition anymore?

dkazakov: Is it correct that INTERSECT is not a part of the condition anymore?
270} 273​}
271 274​
272bool KisSelectionToolHelper::canShortcutToNoop(const QRect &rect, SelectionAction action) 275​bool KisSelectionToolHelper::canShortcutToNoop(const QRect &rect, SelectionAction action)
Context not available.
279 bool result = false; 282​ bool result = false;
280 283​
281 if (KisAlgebra2D::maxDimension(selectionViewRect) < KisConfig(true).selectionViewSizeMinimum() && 284​ if (KisAlgebra2D::maxDimension(selectionViewRect) < KisConfig(true).selectionViewSizeMinimum() &&
282 (action == SELECTION_INTERSECT || action == SELECTION_REPLACE)) { 285​ (action == SELECTION_SYMMETRICDIFFERENCE || action == SELECTION_REPLACE)) {
283 286​
284 // Queueing this action to ensure we avoid a race condition when unlocking the node system 287​ // Queueing this action to ensure we avoid a race condition when unlocking the node system
285 QTimer::singleShot(0, m_canvas->viewManager()->selectionManager(), SLOT(deselect())); 288​ QTimer::singleShot(0, m_canvas->viewManager()->selectionManager(), SLOT(deselect()));
Context not available.