Unverified Commit baf86869 authored by Justin McCandless's avatar Justin McCandless Committed by GitHub

Consistently capitalize Endpoint (not EndPoint) (#106706)

parent bbdf6170
...@@ -514,7 +514,7 @@ class _SelectableRegionState extends State<SelectableRegion> with TextSelectionD ...@@ -514,7 +514,7 @@ class _SelectableRegionState extends State<SelectableRegion> with TextSelectionD
onEndHandleDragStart: _handleSelectionEndHandleDragStart, onEndHandleDragStart: _handleSelectionEndHandleDragStart,
onEndHandleDragUpdate: _handleSelectionEndHandleDragUpdate, onEndHandleDragUpdate: _handleSelectionEndHandleDragUpdate,
onEndHandleDragEnd: (DragEndDetails details) => _stopSelectionEndEdgeUpdate(), onEndHandleDragEnd: (DragEndDetails details) => _stopSelectionEndEdgeUpdate(),
selectionEndPoints: points, selectionEndpoints: points,
selectionControls: widget.selectionControls, selectionControls: widget.selectionControls,
selectionDelegate: this, selectionDelegate: this,
clipboardStatus: null, clipboardStatus: null,
...@@ -550,7 +550,7 @@ class _SelectableRegionState extends State<SelectableRegion> with TextSelectionD ...@@ -550,7 +550,7 @@ class _SelectableRegionState extends State<SelectableRegion> with TextSelectionD
..lineHeightAtStart = start?.lineHeight ?? end!.lineHeight ..lineHeightAtStart = start?.lineHeight ?? end!.lineHeight
..endHandleType = end?.handleType ?? TextSelectionHandleType.right ..endHandleType = end?.handleType ?? TextSelectionHandleType.right
..lineHeightAtEnd = end?.lineHeight ?? start!.lineHeight ..lineHeightAtEnd = end?.lineHeight ?? start!.lineHeight
..selectionEndPoints = points; ..selectionEndpoints = points;
} }
/// Shows the selection handles. /// Shows the selection handles.
......
...@@ -258,7 +258,7 @@ class TextSelectionOverlay { ...@@ -258,7 +258,7 @@ class TextSelectionOverlay {
onEndHandleDragStart: _handleSelectionEndHandleDragStart, onEndHandleDragStart: _handleSelectionEndHandleDragStart,
onEndHandleDragUpdate: _handleSelectionEndHandleDragUpdate, onEndHandleDragUpdate: _handleSelectionEndHandleDragUpdate,
toolbarVisible: _effectiveToolbarVisibility, toolbarVisible: _effectiveToolbarVisibility,
selectionEndPoints: const <TextSelectionPoint>[], selectionEndpoints: const <TextSelectionPoint>[],
selectionControls: selectionControls, selectionControls: selectionControls,
selectionDelegate: selectionDelegate, selectionDelegate: selectionDelegate,
clipboardStatus: clipboardStatus, clipboardStatus: clipboardStatus,
...@@ -373,7 +373,7 @@ class TextSelectionOverlay { ...@@ -373,7 +373,7 @@ class TextSelectionOverlay {
) )
..lineHeightAtEnd = _getEndGlyphHeight() ..lineHeightAtEnd = _getEndGlyphHeight()
// Update selection toolbar metrics. // Update selection toolbar metrics.
..selectionEndPoints = renderObject.getEndpointsForSelection(_selection) ..selectionEndpoints = renderObject.getEndpointsForSelection(_selection)
..toolbarLocation = renderObject.lastSecondaryTapDownPosition; ..toolbarLocation = renderObject.lastSecondaryTapDownPosition;
} }
...@@ -589,7 +589,7 @@ class SelectionOverlay { ...@@ -589,7 +589,7 @@ class SelectionOverlay {
this.onEndHandleDragUpdate, this.onEndHandleDragUpdate,
this.onEndHandleDragEnd, this.onEndHandleDragEnd,
this.toolbarVisible, this.toolbarVisible,
required List<TextSelectionPoint> selectionEndPoints, required List<TextSelectionPoint> selectionEndpoints,
required this.selectionControls, required this.selectionControls,
required this.selectionDelegate, required this.selectionDelegate,
required this.clipboardStatus, required this.clipboardStatus,
...@@ -603,7 +603,7 @@ class SelectionOverlay { ...@@ -603,7 +603,7 @@ class SelectionOverlay {
_lineHeightAtStart = lineHeightAtStart, _lineHeightAtStart = lineHeightAtStart,
_endHandleType = endHandleType, _endHandleType = endHandleType,
_lineHeightAtEnd = lineHeightAtEnd, _lineHeightAtEnd = lineHeightAtEnd,
_selectionEndPoints = selectionEndPoints, _selectionEndpoints = selectionEndpoints,
_toolbarLocation = toolbarLocation { _toolbarLocation = toolbarLocation {
final OverlayState? overlay = Overlay.of(context, rootOverlay: true); final OverlayState? overlay = Overlay.of(context, rootOverlay: true);
assert( assert(
...@@ -721,13 +721,13 @@ class SelectionOverlay { ...@@ -721,13 +721,13 @@ class SelectionOverlay {
final ValueListenable<bool>? toolbarVisible; final ValueListenable<bool>? toolbarVisible;
/// The text selection positions of selection start and end. /// The text selection positions of selection start and end.
List<TextSelectionPoint> get selectionEndPoints => _selectionEndPoints; List<TextSelectionPoint> get selectionEndpoints => _selectionEndpoints;
List<TextSelectionPoint> _selectionEndPoints; List<TextSelectionPoint> _selectionEndpoints;
set selectionEndPoints(List<TextSelectionPoint> value) { set selectionEndpoints(List<TextSelectionPoint> value) {
if (!listEquals(_selectionEndPoints, value)) { if (!listEquals(_selectionEndpoints, value)) {
_markNeedsBuild(); _markNeedsBuild();
} }
_selectionEndPoints = value; _selectionEndpoints = value;
} }
/// Debugging information for explaining why the [Overlay] is required. /// Debugging information for explaining why the [Overlay] is required.
...@@ -800,7 +800,7 @@ class SelectionOverlay { ...@@ -800,7 +800,7 @@ class SelectionOverlay {
/// The location of where the toolbar should be drawn in relative to the /// The location of where the toolbar should be drawn in relative to the
/// location of [toolbarLayerLink]. /// location of [toolbarLayerLink].
/// ///
/// If this is null, the toolbar is drawn based on [selectionEndPoints] and /// If this is null, the toolbar is drawn based on [selectionEndpoints] and
/// the rect of render object of [context]. /// the rect of render object of [context].
/// ///
/// This is useful for displaying toolbars at the mouse right-click locations /// This is useful for displaying toolbars at the mouse right-click locations
...@@ -988,19 +988,19 @@ class SelectionOverlay { ...@@ -988,19 +988,19 @@ class SelectionOverlay {
renderBox.localToGlobal(renderBox.size.bottomRight(Offset.zero)), renderBox.localToGlobal(renderBox.size.bottomRight(Offset.zero)),
); );
final bool isMultiline = selectionEndPoints.last.point.dy - selectionEndPoints.first.point.dy > final bool isMultiline = selectionEndpoints.last.point.dy - selectionEndpoints.first.point.dy >
lineHeightAtEnd / 2; lineHeightAtEnd / 2;
// If the selected text spans more than 1 line, horizontally center the toolbar. // If the selected text spans more than 1 line, horizontally center the toolbar.
// Derived from both iOS and Android. // Derived from both iOS and Android.
final double midX = isMultiline final double midX = isMultiline
? editingRegion.width / 2 ? editingRegion.width / 2
: (selectionEndPoints.first.point.dx + selectionEndPoints.last.point.dx) / 2; : (selectionEndpoints.first.point.dx + selectionEndpoints.last.point.dx) / 2;
final Offset midpoint = Offset( final Offset midpoint = Offset(
midX, midX,
// The y-coordinate won't be made use of most likely. // The y-coordinate won't be made use of most likely.
selectionEndPoints.first.point.dy - lineHeightAtStart, selectionEndpoints.first.point.dy - lineHeightAtStart,
); );
return Directionality( return Directionality(
...@@ -1012,7 +1012,7 @@ class SelectionOverlay { ...@@ -1012,7 +1012,7 @@ class SelectionOverlay {
editingRegion: editingRegion, editingRegion: editingRegion,
selectionControls: selectionControls, selectionControls: selectionControls,
midpoint: midpoint, midpoint: midpoint,
selectionEndpoints: selectionEndPoints, selectionEndpoints: selectionEndpoints,
visibility: toolbarVisible, visibility: toolbarVisible,
selectionDelegate: selectionDelegate, selectionDelegate: selectionDelegate,
clipboardStatus: clipboardStatus, clipboardStatus: clipboardStatus,
......
...@@ -1041,7 +1041,7 @@ void main() { ...@@ -1041,7 +1041,7 @@ void main() {
clipboardStatus: FakeClipboardStatusNotifier(), clipboardStatus: FakeClipboardStatusNotifier(),
selectionDelegate: FakeTextSelectionDelegate(), selectionDelegate: FakeTextSelectionDelegate(),
selectionControls: selectionControls, selectionControls: selectionControls,
selectionEndPoints: const <TextSelectionPoint>[], selectionEndpoints: const <TextSelectionPoint>[],
toolbarLayerLink: toolbarLayerLink, toolbarLayerLink: toolbarLayerLink,
); );
} }
...@@ -1055,7 +1055,7 @@ void main() { ...@@ -1055,7 +1055,7 @@ void main() {
selectionOverlay selectionOverlay
..startHandleType = TextSelectionHandleType.left ..startHandleType = TextSelectionHandleType.left
..endHandleType = TextSelectionHandleType.right ..endHandleType = TextSelectionHandleType.right
..selectionEndPoints = const <TextSelectionPoint>[ ..selectionEndpoints = const <TextSelectionPoint>[
TextSelectionPoint(Offset(10, 10), TextDirection.ltr), TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
TextSelectionPoint(Offset(20, 20), TextDirection.ltr), TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
]; ];
...@@ -1100,7 +1100,7 @@ void main() { ...@@ -1100,7 +1100,7 @@ void main() {
selectionOverlay selectionOverlay
..startHandleType = TextSelectionHandleType.collapsed ..startHandleType = TextSelectionHandleType.collapsed
..endHandleType = TextSelectionHandleType.collapsed ..endHandleType = TextSelectionHandleType.collapsed
..selectionEndPoints = const <TextSelectionPoint>[ ..selectionEndpoints = const <TextSelectionPoint>[
TextSelectionPoint(Offset(10, 10), TextDirection.ltr), TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
TextSelectionPoint(Offset(20, 20), TextDirection.ltr), TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
]; ];
...@@ -1122,7 +1122,7 @@ void main() { ...@@ -1122,7 +1122,7 @@ void main() {
..lineHeightAtStart = 10.0 ..lineHeightAtStart = 10.0
..endHandleType = TextSelectionHandleType.right ..endHandleType = TextSelectionHandleType.right
..lineHeightAtEnd = 11.0 ..lineHeightAtEnd = 11.0
..selectionEndPoints = const <TextSelectionPoint>[ ..selectionEndpoints = const <TextSelectionPoint>[
TextSelectionPoint(Offset(10, 10), TextDirection.ltr), TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
TextSelectionPoint(Offset(20, 20), TextDirection.ltr), TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
]; ];
...@@ -1159,7 +1159,7 @@ void main() { ...@@ -1159,7 +1159,7 @@ void main() {
..lineHeightAtStart = 10.0 ..lineHeightAtStart = 10.0
..endHandleType = TextSelectionHandleType.right ..endHandleType = TextSelectionHandleType.right
..lineHeightAtEnd = 11.0 ..lineHeightAtEnd = 11.0
..selectionEndPoints = const <TextSelectionPoint>[ ..selectionEndpoints = const <TextSelectionPoint>[
TextSelectionPoint(Offset(10, 10), TextDirection.ltr), TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
TextSelectionPoint(Offset(20, 20), TextDirection.ltr), TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
]; ];
...@@ -1206,7 +1206,7 @@ void main() { ...@@ -1206,7 +1206,7 @@ void main() {
..lineHeightAtStart = 10.0 ..lineHeightAtStart = 10.0
..endHandleType = TextSelectionHandleType.right ..endHandleType = TextSelectionHandleType.right
..lineHeightAtEnd = 11.0 ..lineHeightAtEnd = 11.0
..selectionEndPoints = const <TextSelectionPoint>[ ..selectionEndpoints = const <TextSelectionPoint>[
TextSelectionPoint(Offset(10, 10), TextDirection.ltr), TextSelectionPoint(Offset(10, 10), TextDirection.ltr),
TextSelectionPoint(Offset(20, 20), TextDirection.ltr), TextSelectionPoint(Offset(20, 20), TextDirection.ltr),
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment