Skip to content
This repository was archived by the owner on Apr 29, 2021. It is now read-only.

Commit 3961cc8

Browse files
committed
[Format] Remove unnecessary annotations
1 parent 164c0f5 commit 3961cc8

File tree

3 files changed

+32
-29
lines changed

3 files changed

+32
-29
lines changed

Runtime/rendering/proxy_box.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1938,14 +1938,12 @@ public RenderPointerListener(
19381938
PointerUpEventListener onPointerUp = null,
19391939
PointerCancelEventListener onPointerCancel = null,
19401940
PointerScrollEventListener onPointerScroll = null,
1941+
PointerDragFromEditorEnterEventListener onPointerDragFromEditorEnter = null,
1942+
PointerDragFromEditorHoverEventListener onPointerDragFromEditorHover = null,
1943+
PointerDragFromEditorExitEventListener onPointerDragFromEditorExit = null,
1944+
PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease = null,
19411945
HitTestBehavior behavior = HitTestBehavior.deferToChild,
19421946
RenderBox child = null
1943-
1944-
// Drag & Drop
1945-
,PointerDragFromEditorEnterEventListener onPointerDragFromEditorEnter = null
1946-
,PointerDragFromEditorHoverEventListener onPointerDragFromEditorHover = null
1947-
,PointerDragFromEditorExitEventListener onPointerDragFromEditorExit = null
1948-
,PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease = null
19491947
) : base(behavior: behavior, child: child) {
19501948
this.onPointerDown = onPointerDown;
19511949
this.onPointerMove = onPointerMove;
@@ -1957,7 +1955,6 @@ public RenderPointerListener(
19571955
this._onPointerHover = onPointerHover;
19581956
this._onPointerExit = onPointerExit;
19591957

1960-
// Drag & Drop
19611958
this._onPointerDragFromEditorEnter = onPointerDragFromEditorEnter;
19621959
this._onPointerDragFromEditorHover = onPointerDragFromEditorHover;
19631960
this._onPointerDragFromEditorExit = onPointerDragFromEditorExit;

Runtime/ui/pointer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public enum PointerChange {
1111
move,
1212
up,
1313
scroll,
14-
dragFromEditorMove, // Drag & Drop
14+
dragFromEditorMove,
1515
dragFromEditorRelease
1616
}
1717

Runtime/widgets/basic.cs

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1974,14 +1974,12 @@ public Listener(
19741974
PointerUpEventListener onPointerUp = null,
19751975
PointerCancelEventListener onPointerCancel = null,
19761976
PointerScrollEventListener onPointerScroll = null,
1977-
HitTestBehavior behavior = HitTestBehavior.deferToChild,
1978-
Widget child = null,
1979-
1980-
// Drag & Drop
19811977
PointerDragFromEditorEnterEventListener onPointerDragFromEditorEnter = null,
19821978
PointerDragFromEditorHoverEventListener onPointerDragFromEditorHover = null,
19831979
PointerDragFromEditorExitEventListener onPointerDragFromEditorExit = null,
1984-
PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease = null
1980+
PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease = null,
1981+
HitTestBehavior behavior = HitTestBehavior.deferToChild,
1982+
Widget child = null
19851983
) : base(key: key, child: child) {
19861984
this.onPointerDown = onPointerDown;
19871985
this.onPointerMove = onPointerMove;
@@ -1992,8 +1990,7 @@ public Listener(
19921990
this.onPointerEnter = onPointerEnter;
19931991
this.onPointerScroll = onPointerScroll;
19941992
this.behavior = behavior;
1995-
1996-
// Drag & Drop
1993+
19971994
this.onPointerDragFromEditorEnter = onPointerDragFromEditorEnter;
19981995
this.onPointerDragFromEditorHover = onPointerDragFromEditorHover;
19991996
this.onPointerDragFromEditorExit = onPointerDragFromEditorExit;
@@ -2017,13 +2014,15 @@ public Listener(
20172014
public readonly PointerScrollEventListener onPointerScroll;
20182015

20192016
public readonly HitTestBehavior behavior;
2020-
2021-
// Drag & Drop
2017+
20222018
public readonly PointerDragFromEditorEnterEventListener onPointerDragFromEditorEnter;
2019+
20232020
public readonly PointerDragFromEditorHoverEventListener onPointerDragFromEditorHover;
2021+
20242022
public readonly PointerDragFromEditorExitEventListener onPointerDragFromEditorExit;
2025-
public readonly PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease;
20262023

2024+
public readonly PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease;
2025+
20272026
public override RenderObject createRenderObject(BuildContext context) {
20282027
return new RenderPointerListener(
20292028
onPointerDown: this.onPointerDown,
@@ -2034,13 +2033,11 @@ public override RenderObject createRenderObject(BuildContext context) {
20342033
onPointerExit: this.onPointerExit,
20352034
onPointerHover: this.onPointerHover,
20362035
onPointerScroll: this.onPointerScroll,
2037-
behavior: this.behavior,
2038-
2039-
// Drag & Drop
20402036
onPointerDragFromEditorEnter: this.onPointerDragFromEditorEnter,
20412037
onPointerDragFromEditorHover: this.onPointerDragFromEditorHover,
20422038
onPointerDragFromEditorExit: this.onPointerDragFromEditorExit,
2043-
onPointerDragFromEditorRelease: this.onPointerDragFromEditorRelease
2039+
onPointerDragFromEditorRelease: this.onPointerDragFromEditorRelease,
2040+
behavior: this.behavior
20442041
);
20452042
}
20462043

@@ -2057,7 +2054,6 @@ public override void updateRenderObject(BuildContext context, RenderObject rende
20572054
renderObject.behavior = this.behavior;
20582055

20592056
#if UNITY_EDITOR
2060-
// Drag & Drop
20612057
renderObject.onPointerDragFromEditorEnter = this.onPointerDragFromEditorEnter;
20622058
renderObject.onPointerDragFromEditorHover = this.onPointerDragFromEditorHover;
20632059
renderObject.onPointerDragFromEditorExit = this.onPointerDragFromEditorExit;
@@ -2099,13 +2095,23 @@ public override void debugFillProperties(DiagnosticPropertiesBuilder properties)
20992095
if (this.onPointerScroll != null) {
21002096
listeners.Add("scroll");
21012097
}
2102-
2098+
21032099
#if UNITY_EDITOR
2104-
// Drag & Drop
2105-
if (this.onPointerDragFromEditorEnter != null) listeners.Add("dragFromEditorEnter");
2106-
if (this.onPointerDragFromEditorHover != null) listeners.Add("dragFromEditorHover");
2107-
if (this.onPointerDragFromEditorExit != null) listeners.Add("dragFromEditorExit");
2108-
if (this.onPointerDragFromEditorRelease != null) listeners.Add("dragFromEditorRelease");
2100+
if (this.onPointerDragFromEditorEnter != null) {
2101+
listeners.Add("dragFromEditorEnter");
2102+
}
2103+
2104+
if (this.onPointerDragFromEditorHover != null) {
2105+
listeners.Add("dragFromEditorHover");
2106+
}
2107+
2108+
if (this.onPointerDragFromEditorExit != null) {
2109+
listeners.Add("dragFromEditorExit");
2110+
}
2111+
2112+
if (this.onPointerDragFromEditorRelease != null) {
2113+
listeners.Add("dragFromEditorRelease");
2114+
}
21092115
#endif
21102116

21112117
properties.add(new EnumerableProperty<string>("listeners", listeners, ifEmpty: "<none>"));

0 commit comments

Comments
 (0)