Differential D11598 Diff 30472 src/QuickEditor/SelectionRectangle.qml

Changeset View

Standalone View

View Options

src/QuickEditor/SelectionRectangle.qml

Context not available.
25 25​
26 property var drawCanvas: null; 26​ property var drawCanvas: null;
27 property var imageElement: null; 27​ property var imageElement: null;
28​ property var minRectSize: 20;
29​ property var mouseAreaSize: 20;
rkflxUnsubmitted
Done

Please change var to int, which should be faster.

rkflx: Please change `var` to `int`, which should be faster.
28 30​
29 signal doubleClicked(); 31​ signal doubleClicked();
30 32​
Context not available.
68 anchors.top: parent.top; 70​ anchors.top: parent.top;
69 anchors.left: parent.left; 71​ anchors.left: parent.left;
70 72​
71 width: 20; 73​ width: mouseAreaSize;
72 height: 20; 74​ height: mouseAreaSize;
73 cursorShape: Qt.SizeFDiagCursor; 75​ cursorShape: Qt.SizeFDiagCursor;
74 76​
75 onPressed: { 77​ onPressed: {
76 brxLimit = (parent.x + parent.width) - 20; 78​ brxLimit = (parent.x + parent.width) - minRectSize;
77 bryLimit = (parent.y + parent.height) - 20; 79​ bryLimit = (parent.y + parent.height) - minRectSize;
78 } 80​ }
79 81​
80 onPositionChanged: { 82​ onPositionChanged: {
81 if ((parent.x + mouse.x) < brxLimit) { 83​ if ((parent.x + mouse.x) < brxLimit) {
82 parent.width = parent.width - mouse.x; ​
83 parent.x = parent.x + mouse.x; 84​ parent.x = parent.x + mouse.x;
85​ parent.width = parent.width - mouse.x;
84 } 86​ }
rkflxUnsubmitted
Done

Is it really necessary to swap those lines?

(Same comment applies to a bunch of other places…)

rkflx: Is it really necessary to swap those lines? (Same comment applies to a bunch of other places…)
guotaoAuthorUnsubmitted
Done

Yes, It's necessary, these changes fix another bug:

select a rect, make sure the right/bottom edge is beside moniter edge
drag the topleft, top, top right up quickly or drag top left, left, bottom left to left quickly, the bottom/ right edge jump to up / left

I will submit these changes in separate patch

guotao: Yes, It's necessary, these changes fix another bug: select a rect, make sure the right/bottom…
85 87​
86 if ((parent.y + mouse.y) < bryLimit) { 88​ if ((parent.y + mouse.y) < bryLimit) {
87 parent.height = parent.height - mouse.y; ​
88 parent.y = parent.y + mouse.y; 89​ parent.y = parent.y + mouse.y;
90​ parent.height = parent.height - mouse.y;
89 } 91​ }
90 92​
91 drawCanvas.requestPaint(); 93​ drawCanvas.requestPaint();
Context not available.
101 anchors.top: parent.top; 103​ anchors.top: parent.top;
102 anchors.right: parent.right; 104​ anchors.right: parent.right;
103 105​
104 width: 20; 106​ width: mouseAreaSize;
105 height: 20; 107​ height: mouseAreaSize;
106 cursorShape: Qt.SizeBDiagCursor; 108​ cursorShape: Qt.SizeBDiagCursor;
107 109​
108 onPressed: { 110​ onPressed: {
109 brxLimit = parent.x + 20; 111​ brxLimit = parent.x + mouseAreaSize + minRectSize;
110 bryLimit = (parent.y + parent.height) - 20; 112​ bryLimit = (parent.y + parent.height) - minRectSize;
111 } 113​ }
112 114​
113 onPositionChanged: { 115​ onPositionChanged: {
114 if ((parent.x + parent.width + mouse.x) > brxLimit) { 116​ if ((parent.x + parent.width + mouse.x) > brxLimit) {
115 parent.width = parent.width + mouse.x; 117​ parent.width = parent.width + mouse.x - mouseAreaSize;
116 } 118​ }
117 119​
118 if ((parent.y + mouse.y) < bryLimit) { 120​ if ((parent.y + mouse.y) < bryLimit) {
119 parent.height = parent.height - mouse.y; ​
120 parent.y = parent.y + mouse.y; 121​ parent.y = parent.y + mouse.y;
122​ parent.height = parent.height - mouse.y;
121 } 123​ }
122 124​
123 drawCanvas.requestPaint(); 125​ drawCanvas.requestPaint();
Context not available.
133 anchors.bottom: parent.bottom; 135​ anchors.bottom: parent.bottom;
134 anchors.left: parent.left; 136​ anchors.left: parent.left;
135 137​
136 width: 20; 138​ width: mouseAreaSize;
137 height: 20; 139​ height: mouseAreaSize;
138 cursorShape: Qt.SizeBDiagCursor; 140​ cursorShape: Qt.SizeBDiagCursor;
139 141​
140 onPressed: { 142​ onPressed: {
141 brxLimit = (parent.x + parent.width) - 20; 143​ brxLimit = (parent.x + parent.width) - minRectSize;
142 bryLimit = parent.y + 20; 144​ bryLimit = parent.y + mouseAreaSize + minRectSize;
143 } 145​ }
144 146​
145 onPositionChanged: { 147​ onPositionChanged: {
146 if ((parent.x + mouse.x) < brxLimit) { 148​ if ((parent.x + mouse.x) < brxLimit) {
147 parent.width = parent.width - mouse.x; ​
148 parent.x = parent.x + mouse.x; 149​ parent.x = parent.x + mouse.x;
150​ parent.width = parent.width - mouse.x;
149 } 151​ }
150 152​
151 if ((parent.y + parent.height + mouse.y) > bryLimit) { 153​ if ((parent.y + parent.height + mouse.y) > bryLimit) {
152 parent.height = parent.height + mouse.y; 154​ parent.height = parent.height + mouse.y - mouseAreaSize;
153 } 155​ }
154 156​
155 drawCanvas.requestPaint(); 157​ drawCanvas.requestPaint();
Context not available.
165 anchors.bottom: parent.bottom; 167​ anchors.bottom: parent.bottom;
166 anchors.right: parent.right; 168​ anchors.right: parent.right;
167 169​
168 width: 20; 170​ width: mouseAreaSize;
169 height: 20; 171​ height: mouseAreaSize;
170 cursorShape: Qt.SizeFDiagCursor; 172​ cursorShape: Qt.SizeFDiagCursor;
171 173​
172 onPressed: { 174​ onPressed: {
173 brxLimit = parent.x + 20; 175​ brxLimit = parent.x + mouseAreaSize + minRectSize;
174 bryLimit = parent.y + 20; 176​ bryLimit = parent.y + mouseAreaSize + minRectSize;
175 } 177​ }
176 178​
177 onPositionChanged: { 179​ onPositionChanged: {
178 if ((parent.x + parent.width + mouse.x) > brxLimit) { 180​ if ((parent.x + parent.width + mouse.x) > brxLimit) {
179 parent.width = parent.width + mouse.x; 181​ parent.width = parent.width + mouse.x - mouseAreaSize;
180 } 182​ }
181 183​
182 if ((parent.y + parent.height + mouse.y) > bryLimit) { 184​ if ((parent.y + parent.height + mouse.y) > bryLimit) {
183 parent.height = parent.height + mouse.y; 185​ parent.height = parent.height + mouse.y - mouseAreaSize;
184 } 186​ }
185 187​
186 drawCanvas.requestPaint(); 188​ drawCanvas.requestPaint();
Context not available.
195 anchors.horizontalCenter: parent.horizontalCenter; 197​ anchors.horizontalCenter: parent.horizontalCenter;
196 anchors.top: parent.top; 198​ anchors.top: parent.top;
197 199​
198 width: 20; 200​ width: mouseAreaSize;
199 height: 20; 201​ height: mouseAreaSize;
200 cursorShape: Qt.SizeVerCursor; 202​ cursorShape: Qt.SizeVerCursor;
201 203​
202 onPressed: { 204​ onPressed: {
203 limit = (parent.y + parent.height) - 20; 205​ limit = (parent.y + parent.height) - minRectSize;
204 } 206​ }
205 207​
206 onPositionChanged: { 208​ onPositionChanged: {
207 if ((parent.y + mouse.y) < limit) { 209​ if ((parent.y + mouse.y) < limit) {
208 parent.height = parent.height - mouse.y; ​
209 parent.y = parent.y + mouse.y; 210​ parent.y = parent.y + mouse.y;
211​ parent.height = parent.height - mouse.y;
210 } 212​ }
211 213​
212 drawCanvas.requestPaint(); 214​ drawCanvas.requestPaint();
Context not available.
221 anchors.horizontalCenter: parent.horizontalCenter; 223​ anchors.horizontalCenter: parent.horizontalCenter;
222 anchors.bottom: parent.bottom; 224​ anchors.bottom: parent.bottom;
223 225​
224 width: 20; 226​ width: mouseAreaSize;
225 height: 20; 227​ height: mouseAreaSize;
226 cursorShape: Qt.SizeVerCursor; 228​ cursorShape: Qt.SizeVerCursor;
227 229​
228 onPressed: { 230​ onPressed: {
229 limit = parent.y + 20; 231​ limit = parent.y + mouseAreaSize + minRectSize;
230 } 232​ }
231 233​
232 onPositionChanged: { 234​ onPositionChanged: {
233 if ((parent.y + parent.height + mouse.y) > limit) { 235​ if ((parent.y + parent.height + mouse.y) > limit) {
234 parent.height = parent.height + mouse.y; 236​ parent.height = parent.height + mouse.y - mouseAreaSize;
235 } 237​ }
236 238​
237 drawCanvas.requestPaint(); 239​ drawCanvas.requestPaint();
Context not available.
246 anchors.verticalCenter: parent.verticalCenter; 248​ anchors.verticalCenter: parent.verticalCenter;
247 anchors.left: parent.left; 249​ anchors.left: parent.left;
248 250​
249 width: 20; 251​ width: mouseAreaSize;
250 height: 20; 252​ height: mouseAreaSize;
251 cursorShape: Qt.SizeHorCursor; 253​ cursorShape: Qt.SizeHorCursor;
252 254​
253 onPressed: { 255​ onPressed: {
254 limit = (parent.x + parent.width) - 20; 256​ limit = (parent.x + parent.width) - minRectSize;
255 } 257​ }
256 258​
257 onPositionChanged: { 259​ onPositionChanged: {
258 if ((parent.x + mouse.x) < limit) { 260​ if ((parent.x + mouse.x) < limit) {
259 parent.width = parent.width - mouse.x; ​
260 parent.x = parent.x + mouse.x; 261​ parent.x = parent.x + mouse.x;
262​ parent.width = parent.width - mouse.x;
261 } 263​ }
262 264​
263 drawCanvas.requestPaint(); 265​ drawCanvas.requestPaint();
Context not available.
272 anchors.verticalCenter: parent.verticalCenter; 274​ anchors.verticalCenter: parent.verticalCenter;
273 anchors.right: parent.right; 275​ anchors.right: parent.right;
274 276​
275 width: 20; 277​ width: mouseAreaSize;
276 height: 20; 278​ height: mouseAreaSize;
277 cursorShape: Qt.SizeHorCursor; 279​ cursorShape: Qt.SizeHorCursor;
278 280​
279 onPressed: { 281​ onPressed: {
280 limit = parent.x + 20; 282​ limit = parent.x + mouseAreaSize + minRectSize;
281 } 283​ }
282 284​
283 onPositionChanged: { 285​ onPositionChanged: {
284 if ((parent.x + parent.width + mouse.x) > limit) { 286​ if ((parent.x + parent.width + mouse.x) > limit) {
285 parent.width = parent.width + mouse.x; 287​ parent.width = parent.width + mouse.x - mouseAreaSize;
286 } 288​ }
287 289​
288 drawCanvas.requestPaint(); 290​ drawCanvas.requestPaint();
Context not available.