@@ -1974,14 +1974,12 @@ public Listener(
1974
1974
PointerUpEventListener onPointerUp = null ,
1975
1975
PointerCancelEventListener onPointerCancel = null ,
1976
1976
PointerScrollEventListener onPointerScroll = null ,
1977
- HitTestBehavior behavior = HitTestBehavior . deferToChild ,
1978
- Widget child = null ,
1979
-
1980
- // Drag & Drop
1981
1977
PointerDragFromEditorEnterEventListener onPointerDragFromEditorEnter = null ,
1982
1978
PointerDragFromEditorHoverEventListener onPointerDragFromEditorHover = null ,
1983
1979
PointerDragFromEditorExitEventListener onPointerDragFromEditorExit = null ,
1984
- PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease = null
1980
+ PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease = null ,
1981
+ HitTestBehavior behavior = HitTestBehavior . deferToChild ,
1982
+ Widget child = null
1985
1983
) : base ( key : key , child : child ) {
1986
1984
this . onPointerDown = onPointerDown ;
1987
1985
this . onPointerMove = onPointerMove ;
@@ -1992,8 +1990,7 @@ public Listener(
1992
1990
this . onPointerEnter = onPointerEnter ;
1993
1991
this . onPointerScroll = onPointerScroll ;
1994
1992
this . behavior = behavior ;
1995
-
1996
- // Drag & Drop
1993
+
1997
1994
this . onPointerDragFromEditorEnter = onPointerDragFromEditorEnter ;
1998
1995
this . onPointerDragFromEditorHover = onPointerDragFromEditorHover ;
1999
1996
this . onPointerDragFromEditorExit = onPointerDragFromEditorExit ;
@@ -2017,13 +2014,15 @@ public Listener(
2017
2014
public readonly PointerScrollEventListener onPointerScroll ;
2018
2015
2019
2016
public readonly HitTestBehavior behavior ;
2020
-
2021
- // Drag & Drop
2017
+
2022
2018
public readonly PointerDragFromEditorEnterEventListener onPointerDragFromEditorEnter ;
2019
+
2023
2020
public readonly PointerDragFromEditorHoverEventListener onPointerDragFromEditorHover ;
2021
+
2024
2022
public readonly PointerDragFromEditorExitEventListener onPointerDragFromEditorExit ;
2025
- public readonly PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease ;
2026
2023
2024
+ public readonly PointerDragFromEditorReleaseEventListener onPointerDragFromEditorRelease ;
2025
+
2027
2026
public override RenderObject createRenderObject ( BuildContext context ) {
2028
2027
return new RenderPointerListener (
2029
2028
onPointerDown : this . onPointerDown ,
@@ -2034,13 +2033,11 @@ public override RenderObject createRenderObject(BuildContext context) {
2034
2033
onPointerExit : this . onPointerExit ,
2035
2034
onPointerHover : this . onPointerHover ,
2036
2035
onPointerScroll : this . onPointerScroll ,
2037
- behavior : this . behavior ,
2038
-
2039
- // Drag & Drop
2040
2036
onPointerDragFromEditorEnter : this . onPointerDragFromEditorEnter ,
2041
2037
onPointerDragFromEditorHover : this . onPointerDragFromEditorHover ,
2042
2038
onPointerDragFromEditorExit : this . onPointerDragFromEditorExit ,
2043
- onPointerDragFromEditorRelease : this . onPointerDragFromEditorRelease
2039
+ onPointerDragFromEditorRelease : this . onPointerDragFromEditorRelease ,
2040
+ behavior : this . behavior
2044
2041
) ;
2045
2042
}
2046
2043
@@ -2057,7 +2054,6 @@ public override void updateRenderObject(BuildContext context, RenderObject rende
2057
2054
renderObject . behavior = this . behavior ;
2058
2055
2059
2056
#if UNITY_EDITOR
2060
- // Drag & Drop
2061
2057
renderObject . onPointerDragFromEditorEnter = this . onPointerDragFromEditorEnter ;
2062
2058
renderObject . onPointerDragFromEditorHover = this . onPointerDragFromEditorHover ;
2063
2059
renderObject . onPointerDragFromEditorExit = this . onPointerDragFromEditorExit ;
@@ -2099,13 +2095,23 @@ public override void debugFillProperties(DiagnosticPropertiesBuilder properties)
2099
2095
if ( this . onPointerScroll != null ) {
2100
2096
listeners . Add ( "scroll" ) ;
2101
2097
}
2102
-
2098
+
2103
2099
#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
+ }
2109
2115
#endif
2110
2116
2111
2117
properties . add ( new EnumerableProperty < string > ( "listeners" , listeners , ifEmpty : "<none>" ) ) ;
0 commit comments