Skip to content

Commit 79d74be

Browse files
committed
Bug 2000416 - Allow dragging with pen. r=masayuki,devtools-reviewers,nchevobbe
Differential Revision: https://phabricator.services.mozilla.com/D272800 UltraBlame original commit: 8a8e48d2a0322e2c726589ed7f637af9f7dfc33d
1 parent 47388e1 commit 79d74be

File tree

4 files changed

+171
-111
lines changed

4 files changed

+171
-111
lines changed

devtools/client/inspector/rules/views/text-property-editor.js

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,30 @@ js
192192
"
193193
)
194194
;
195+
const
196+
{
197+
canPointerEventDrag
198+
}
199+
=
200+
require
201+
(
202+
"
203+
resource
204+
:
205+
/
206+
/
207+
devtools
208+
/
209+
client
210+
/
211+
shared
212+
/
213+
events
214+
.
215+
js
216+
"
217+
)
218+
;
195219
loader
196220
.
197221
lazyRequireGetter
@@ -10800,46 +10824,13 @@ event
1080010824
=
1080110825
>
1080210826
{
10803-
/
10804-
/
10805-
We
10806-
want
10807-
to
10808-
handle
10809-
a
10810-
drag
10811-
during
10812-
a
10813-
mouse
10814-
button
10815-
is
10816-
pressed
10817-
.
10818-
So
10819-
we
10820-
can
10821-
/
10822-
/
10823-
ignore
10824-
pointer
10825-
events
10826-
which
10827-
are
10828-
caused
10829-
by
10830-
other
10831-
devices
10832-
.
1083310827
if
1083410828
(
10835-
event
10836-
.
10837-
pointerType
1083810829
!
10839-
=
10840-
"
10841-
mouse
10842-
"
10830+
canPointerEventDrag
10831+
(
10832+
event
10833+
)
1084310834
)
1084410835
{
1084510836
return

devtools/client/shared/components/splitter/Draggable.js

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,30 @@ js
144144
"
145145
)
146146
;
147+
const
148+
{
149+
canPointerEventDrag
150+
}
151+
=
152+
require
153+
(
154+
"
155+
resource
156+
:
157+
/
158+
/
159+
devtools
160+
/
161+
client
162+
/
163+
shared
164+
/
165+
events
166+
.
167+
js
168+
"
169+
)
170+
;
147171
class
148172
Draggable
149173
extends
@@ -285,46 +309,13 @@ startDragging
285309
ev
286310
)
287311
{
288-
/
289-
/
290-
We
291-
want
292-
to
293-
handle
294-
a
295-
drag
296-
during
297-
a
298-
mouse
299-
button
300-
is
301-
pressed
302-
.
303-
So
304-
we
305-
can
306-
/
307-
/
308-
ignore
309-
pointer
310-
events
311-
which
312-
are
313-
caused
314-
by
315-
other
316-
devices
317-
.
318312
if
319313
(
320-
ev
321-
.
322-
pointerType
323314
!
324-
=
325-
"
326-
mouse
327-
"
315+
canPointerEventDrag
316+
(
317+
ev
318+
)
328319
)
329320
{
330321
return

devtools/client/shared/events.js

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,90 @@ stopPropagation
157157
}
158158
}
159159
;
160+
/
161+
*
162+
*
163+
*
164+
Returns
165+
true
166+
if
167+
the
168+
pointer
169+
event
170+
can
171+
perform
172+
drag
173+
.
174+
*
175+
*
176+
We
177+
want
178+
to
179+
handle
180+
a
181+
drag
182+
during
183+
a
184+
button
185+
is
186+
pressed
187+
.
188+
So
189+
we
190+
can
191+
ignore
192+
*
193+
pointer
194+
events
195+
which
196+
are
197+
caused
198+
by
199+
other
200+
devices
201+
.
202+
*
203+
*
204+
param
205+
{
206+
PointerEvent
207+
}
208+
event
209+
*
210+
returns
211+
{
212+
boolean
213+
}
214+
*
215+
/
216+
exports
217+
.
218+
canPointerEventDrag
219+
=
220+
function
221+
(
222+
event
223+
)
224+
{
225+
return
226+
event
227+
.
228+
pointerType
229+
=
230+
=
231+
"
232+
mouse
233+
"
234+
|
235+
|
236+
event
237+
.
238+
pointerType
239+
=
240+
=
241+
"
242+
pen
243+
"
244+
;
245+
}
246+
;

devtools/client/shared/widgets/LinearEasingFunctionWidget.js

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,30 @@ throttle
137137
)
138138
;
139139
const
140+
{
141+
canPointerEventDrag
142+
}
143+
=
144+
require
145+
(
146+
"
147+
resource
148+
:
149+
/
150+
/
151+
devtools
152+
/
153+
client
154+
/
155+
shared
156+
/
157+
events
158+
.
159+
js
160+
"
161+
)
162+
;
163+
const
140164
XHTML_NS
141165
=
142166
"
@@ -1367,44 +1391,11 @@ event
13671391
{
13681392
if
13691393
(
1370-
/
1371-
/
1372-
We
1373-
want
1374-
to
1375-
handle
1376-
a
1377-
drag
1378-
during
1379-
a
1380-
mouse
1381-
button
1382-
is
1383-
pressed
1384-
.
1385-
So
1386-
we
1387-
can
1388-
/
1389-
/
1390-
ignore
1391-
pointer
1392-
events
1393-
which
1394-
are
1395-
caused
1396-
by
1397-
other
1398-
devices
1399-
.
1400-
event
1401-
.
1402-
pointerType
14031394
!
1404-
=
1405-
"
1406-
mouse
1407-
"
1395+
canPointerEventDrag
1396+
(
1397+
event
1398+
)
14081399
|
14091400
|
14101401
!

0 commit comments

Comments
 (0)