Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
63f41746
Unverified
Commit
63f41746
authored
Jun 09, 2023
by
hangyu
Committed by
GitHub
Jun 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Paint SelectableFragments before text (#128375)
fixes: #104703
parent
f6558431
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
12 deletions
+27
-12
paragraph.dart
packages/flutter/lib/src/rendering/paragraph.dart
+7
-5
paragraph_test.dart
packages/flutter/test/rendering/paragraph_test.dart
+14
-1
default_colors_test.dart
packages/flutter/test/widgets/default_colors_test.dart
+6
-6
No files found.
packages/flutter/lib/src/rendering/paragraph.dart
View file @
63f41746
...
@@ -865,6 +865,13 @@ class RenderParagraph extends RenderBox with ContainerRenderObjectMixin<RenderBo
...
@@ -865,6 +865,13 @@ class RenderParagraph extends RenderBox with ContainerRenderObjectMixin<RenderBo
}
}
context
.
canvas
.
clipRect
(
bounds
);
context
.
canvas
.
clipRect
(
bounds
);
}
}
if
(
_lastSelectableFragments
!=
null
)
{
for
(
final
_SelectableFragment
fragment
in
_lastSelectableFragments
!)
{
fragment
.
paint
(
context
,
offset
);
}
}
_textPainter
.
paint
(
context
.
canvas
,
offset
);
_textPainter
.
paint
(
context
.
canvas
,
offset
);
paintInlineChildren
(
context
,
offset
);
paintInlineChildren
(
context
,
offset
);
...
@@ -879,11 +886,6 @@ class RenderParagraph extends RenderBox with ContainerRenderObjectMixin<RenderBo
...
@@ -879,11 +886,6 @@ class RenderParagraph extends RenderBox with ContainerRenderObjectMixin<RenderBo
}
}
context
.
canvas
.
restore
();
context
.
canvas
.
restore
();
}
}
if
(
_lastSelectableFragments
!=
null
)
{
for
(
final
_SelectableFragment
fragment
in
_lastSelectableFragments
!)
{
fragment
.
paint
(
context
,
offset
);
}
}
}
}
/// Returns the offset at which to paint the caret.
/// Returns the offset at which to paint the caret.
...
...
packages/flutter/test/rendering/paragraph_test.dart
View file @
63f41746
...
@@ -805,10 +805,14 @@ void main() {
...
@@ -805,10 +805,14 @@ void main() {
expect
(
paintingContext
.
canvas
.
drawnRect
,
isNull
);
expect
(
paintingContext
.
canvas
.
drawnRect
,
isNull
);
expect
(
paintingContext
.
canvas
.
drawnRectPaint
,
isNull
);
expect
(
paintingContext
.
canvas
.
drawnRectPaint
,
isNull
);
selectionParagraph
(
paragraph
,
const
TextPosition
(
offset:
1
),
const
TextPosition
(
offset:
5
));
selectionParagraph
(
paragraph
,
const
TextPosition
(
offset:
1
),
const
TextPosition
(
offset:
5
));
paintingContext
.
canvas
.
clear
();
paragraph
.
paint
(
paintingContext
,
Offset
.
zero
);
paragraph
.
paint
(
paintingContext
,
Offset
.
zero
);
expect
(
paintingContext
.
canvas
.
drawnRect
,
const
Rect
.
fromLTWH
(
14.0
,
0.0
,
56.0
,
14.0
));
expect
(
paintingContext
.
canvas
.
drawnRect
,
const
Rect
.
fromLTWH
(
14.0
,
0.0
,
56.0
,
14.0
));
expect
(
paintingContext
.
canvas
.
drawnRectPaint
!.
style
,
PaintingStyle
.
fill
);
expect
(
paintingContext
.
canvas
.
drawnRectPaint
!.
style
,
PaintingStyle
.
fill
);
expect
(
paintingContext
.
canvas
.
drawnRectPaint
!.
color
,
selectionColor
);
expect
(
paintingContext
.
canvas
.
drawnRectPaint
!.
color
,
selectionColor
);
// Selection highlight is painted before text.
expect
(
paintingContext
.
canvas
.
drawnItemTypes
,
<
Type
>[
Rect
,
ui
.
Paragraph
]);
selectionParagraph
(
paragraph
,
const
TextPosition
(
offset:
2
),
const
TextPosition
(
offset:
4
));
selectionParagraph
(
paragraph
,
const
TextPosition
(
offset:
2
),
const
TextPosition
(
offset:
4
));
paragraph
.
paint
(
paintingContext
,
Offset
.
zero
);
paragraph
.
paint
(
paintingContext
,
Offset
.
zero
);
...
@@ -1293,15 +1297,24 @@ void main() {
...
@@ -1293,15 +1297,24 @@ void main() {
class
MockCanvas
extends
Fake
implements
Canvas
{
class
MockCanvas
extends
Fake
implements
Canvas
{
Rect
?
drawnRect
;
Rect
?
drawnRect
;
Paint
?
drawnRectPaint
;
Paint
?
drawnRectPaint
;
List
<
Type
>
drawnItemTypes
=<
Type
>[];
@override
@override
void
drawRect
(
Rect
rect
,
Paint
paint
)
{
void
drawRect
(
Rect
rect
,
Paint
paint
)
{
drawnRect
=
rect
;
drawnRect
=
rect
;
drawnRectPaint
=
paint
;
drawnRectPaint
=
paint
;
drawnItemTypes
.
add
(
Rect
);
}
}
@override
@override
void
drawParagraph
(
ui
.
Paragraph
paragraph
,
Offset
offset
)
{
}
void
drawParagraph
(
ui
.
Paragraph
paragraph
,
Offset
offset
)
{
drawnItemTypes
.
add
(
ui
.
Paragraph
);
}
void
clear
()
{
drawnRect
=
null
;
drawnRectPaint
=
null
;
drawnItemTypes
.
clear
();
}
}
}
class
MockPaintingContext
extends
Fake
implements
PaintingContext
{
class
MockPaintingContext
extends
Fake
implements
PaintingContext
{
...
...
packages/flutter/test/widgets/default_colors_test.dart
View file @
63f41746
...
@@ -83,7 +83,7 @@ void main() {
...
@@ -83,7 +83,7 @@ void main() {
child:
Align
(
child:
Align
(
key:
key
,
key:
key
,
alignment:
Alignment
.
topLeft
,
alignment:
Alignment
.
topLeft
,
child:
const
Text
(
'Éxp'
,
textDirection:
TextDirection
.
ltr
,
style:
TextStyle
(
fontSize:
_crispText
)),
child:
const
Text
(
'Éxp'
,
textDirection:
TextDirection
.
ltr
,
style:
TextStyle
(
fontSize:
_crispText
,
color:
Color
(
0xFF000000
)
)),
),
),
),
),
),
),
...
@@ -97,7 +97,7 @@ void main() {
...
@@ -97,7 +97,7 @@ void main() {
await
_expectColors
(
await
_expectColors
(
tester
,
tester
,
find
.
byType
(
Align
),
find
.
byType
(
Align
),
<
Color
>{
const
Color
(
0xFFFFFFFF
)
},
<
Color
>{
const
Color
(
0xFFFFFFFF
)
,
const
Color
(
0xFF000000
)
},
);
);
// fake a "select all" event to select the text
// fake a "select all" event to select the text
Actions
.
invoke
(
key
.
currentContext
!,
const
SelectAllTextIntent
(
SelectionChangedCause
.
keyboard
));
Actions
.
invoke
(
key
.
currentContext
!,
const
SelectAllTextIntent
(
SelectionChangedCause
.
keyboard
));
...
@@ -105,13 +105,13 @@ void main() {
...
@@ -105,13 +105,13 @@ void main() {
await
_expectColors
(
await
_expectColors
(
tester
,
tester
,
find
.
byType
(
Align
),
find
.
byType
(
Align
),
<
Color
>{
const
Color
(
0xFFFFFFFF
),
const
Color
(
0xFFBFBFBF
)
},
// 0x80808080 blended with 0xFFFFFFFF
<
Color
>{
const
Color
(
0xFFFFFFFF
),
const
Color
(
0xFF
000000
),
const
Color
(
0xFF
BFBFBF
)
},
// 0x80808080 blended with 0xFFFFFFFF
<
Offset
,
Color
>{
<
Offset
,
Color
>{
Offset
.
zero
:
const
Color
(
0xFF
BFBFBF
),
// the selected text
Offset
.
zero
:
const
Color
(
0xFF
000000
),
// the selected text
const
Offset
(
10
,
10
):
const
Color
(
0xFF
BFBFBF
),
// the selected text
const
Offset
(
10
,
10
):
const
Color
(
0xFF
000000
),
// the selected text
const
Offset
(
50
,
95
):
const
Color
(
0xFFBFBFBF
),
// the selected background (under the É)
const
Offset
(
50
,
95
):
const
Color
(
0xFFBFBFBF
),
// the selected background (under the É)
const
Offset
(
250
,
50
):
const
Color
(
0xFFBFBFBF
),
// the selected background (above the p)
const
Offset
(
250
,
50
):
const
Color
(
0xFFBFBFBF
),
// the selected background (above the p)
const
Offset
(
250
,
95
):
const
Color
(
0xFF
BFBFBF
),
// the selected text (the p)
const
Offset
(
250
,
95
):
const
Color
(
0xFF
000000
),
// the selected text (the p)
const
Offset
(
400
,
400
):
const
Color
(
0xFFFFFFFF
),
// the background
const
Offset
(
400
,
400
):
const
Color
(
0xFFFFFFFF
),
// the background
const
Offset
(
799
,
599
):
const
Color
(
0xFFFFFFFF
),
// the background
const
Offset
(
799
,
599
):
const
Color
(
0xFFFFFFFF
),
// the background
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment