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
b3d9fb4d
Unverified
Commit
b3d9fb4d
authored
Nov 16, 2018
by
jslavitz
Committed by
GitHub
Nov 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Scaffold Drawer pull out area fix for notched devices (#24367)
* Adds fix and test
parent
4a79caf9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
113 additions
and
2 deletions
+113
-2
IDEWorkspaceChecks.plist
.../Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+8
-0
drawer.dart
packages/flutter/lib/src/material/drawer.dart
+12
-2
scaffold_test.dart
packages/flutter/test/material/scaffold_test.dart
+93
-0
No files found.
examples/flutter_gallery/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
0 → 100644
View file @
b3d9fb4d
<
?xml
v
e
rsion="
1
.
0
"
e
n
c
o
d
ing="UT
F
-
8
"?
>
<
!
D
O
C
TYP
E
plist
PU
B
LI
C
"-//
A
ppl
e
//
D
T
D
PLIST
1
.
0
//
E
N"
"http://www.
a
ppl
e
.
c
om/
D
T
D
s/Prop
e
rtyList-
1
.
0
.
d
t
d
"
>
<
plist
v
e
rsion="
1
.
0
"
>
<
d
i
c
t
>
<
k
e
y
>
IDEDidComputeMac32BitWarning
<
/k
e
y
>
<
tru
e
/
>
<
/
d
i
c
t
>
<
/plist
>
packages/flutter/lib/src/material/drawer.dart
View file @
b3d9fb4d
...
...
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import
'dart:math'
;
import
'package:flutter/foundation.dart'
;
import
'package:flutter/widgets.dart'
;
...
...
@@ -375,6 +377,14 @@ class DrawerControllerState extends State<DrawerController> with SingleTickerPro
}
Widget
_buildDrawer
(
BuildContext
context
)
{
final
bool
drawerIsStart
=
widget
.
alignment
==
DrawerAlignment
.
start
;
final
EdgeInsets
padding
=
MediaQuery
.
of
(
context
).
padding
;
double
dragAreaWidth
=
drawerIsStart
?
padding
.
left
:
padding
.
right
;
if
(
Directionality
.
of
(
context
)
==
TextDirection
.
rtl
)
dragAreaWidth
=
drawerIsStart
?
padding
.
right
:
padding
.
left
;
dragAreaWidth
=
max
(
dragAreaWidth
,
_kEdgeDragWidth
);
if
(
_controller
.
status
==
AnimationStatus
.
dismissed
)
{
return
Align
(
alignment:
_drawerOuterAlignment
,
...
...
@@ -384,7 +394,7 @@ class DrawerControllerState extends State<DrawerController> with SingleTickerPro
onHorizontalDragEnd:
_settle
,
behavior:
HitTestBehavior
.
translucent
,
excludeFromSemantics:
true
,
child:
Container
(
width:
_kEdgeDragWidth
)
child:
Container
(
width:
dragAreaWidth
),
),
);
}
else
{
...
...
@@ -420,7 +430,7 @@ class DrawerControllerState extends State<DrawerController> with SingleTickerPro
child:
FocusScope
(
key:
_drawerKey
,
node:
_focusScopeNode
,
child:
widget
.
child
child:
widget
.
child
,
),
),
),
...
...
packages/flutter/test/material/scaffold_test.dart
View file @
b3d9fb4d
...
...
@@ -1103,6 +1103,99 @@ void main() {
expect
(
find
.
text
(
'endDrawer'
),
findsNothing
);
expect
(
find
.
text
(
'drawer'
),
findsOneWidget
);
});
testWidgets
(
'Drawer opens correctly with padding from MediaQuery'
,
(
WidgetTester
tester
)
async
{
// The padding described by MediaQuery is larger than the default
// drawer drag zone width which is 20.
await
tester
.
pumpWidget
(
MaterialApp
(
home:
Scaffold
(
drawer:
const
Drawer
(
child:
Text
(
'drawer'
),
),
body:
const
Text
(
'scaffold body'
),
appBar:
AppBar
(
centerTitle:
true
,
title:
const
Text
(
'Title'
)
),
),
),
);
ScaffoldState
scaffoldState
=
tester
.
state
(
find
.
byType
(
Scaffold
));
expect
(
scaffoldState
.
isDrawerOpen
,
false
);
await
tester
.
dragFrom
(
const
Offset
(
35
,
100
),
const
Offset
(
300
,
0
));
await
tester
.
pumpAndSettle
();
expect
(
scaffoldState
.
isDrawerOpen
,
false
);
await
tester
.
pumpWidget
(
MaterialApp
(
home:
MediaQuery
(
data:
const
MediaQueryData
(
padding:
EdgeInsets
.
fromLTRB
(
40
,
0
,
0
,
0
)
),
child:
Scaffold
(
drawer:
const
Drawer
(
child:
Text
(
'drawer'
),
),
body:
const
Text
(
'scaffold body'
),
appBar:
AppBar
(
centerTitle:
true
,
title:
const
Text
(
'Title'
)
),
),
),
),
);
scaffoldState
=
tester
.
state
(
find
.
byType
(
Scaffold
));
expect
(
scaffoldState
.
isDrawerOpen
,
false
);
await
tester
.
dragFrom
(
const
Offset
(
35
,
100
),
const
Offset
(
300
,
0
));
await
tester
.
pumpAndSettle
();
expect
(
scaffoldState
.
isDrawerOpen
,
true
);
});
testWidgets
(
'Drawer opens correctly with padding from MediaQuer (RTL)'
,
(
WidgetTester
tester
)
async
{
// The padding described by MediaQuery is larger than the default
// drawer drag zone width which is 20.
await
tester
.
pumpWidget
(
MaterialApp
(
home:
MediaQuery
(
data:
const
MediaQueryData
(
padding:
EdgeInsets
.
fromLTRB
(
0
,
0
,
40
,
0
)
),
child:
Directionality
(
textDirection:
TextDirection
.
rtl
,
child:
Scaffold
(
drawer:
const
Drawer
(
child:
Text
(
'drawer'
),
),
body:
const
Text
(
'scaffold body'
),
appBar:
AppBar
(
centerTitle:
true
,
title:
const
Text
(
'Title'
)
),
),
),
),
),
);
final
ScaffoldState
scaffoldState
=
tester
.
state
(
find
.
byType
(
Scaffold
));
expect
(
scaffoldState
.
isDrawerOpen
,
false
);
await
tester
.
dragFrom
(
const
Offset
(
765
,
100
),
const
Offset
(-
300
,
0
));
await
tester
.
pumpAndSettle
();
expect
(
scaffoldState
.
isDrawerOpen
,
true
);
});
});
}
...
...
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