Unverified Commit f2ffc8de authored by Ian Hickson's avatar Ian Hickson Committed by GitHub

Fix RTL icons (#15095)

parent feadfd2e
...@@ -52,16 +52,16 @@ class IconsDemoState extends State<IconsDemo> { ...@@ -52,16 +52,16 @@ class IconsDemoState extends State<IconsDemo> {
), ),
body: new IconTheme( body: new IconTheme(
data: new IconThemeData(color: iconColor), data: new IconThemeData(color: iconColor),
child: new Padding( child: new SafeArea(
padding: const EdgeInsets.all(24.0), top: false,
child: new SafeArea( bottom: false,
top: false, child: new ListView(
bottom: false, padding: const EdgeInsets.all(24.0),
child: new Column( children: <Widget>[
children: <Widget>[ new _IconsDemoCard(handleIconButtonPress, Icons.face), // direction-agnostic icon
new _IconsDemoCard(handleIconButtonPress), const SizedBox(height: 24.0),
], new _IconsDemoCard(handleIconButtonPress, Icons.battery_unknown), // direction-aware icon
), ],
), ),
), ),
), ),
...@@ -70,10 +70,10 @@ class IconsDemoState extends State<IconsDemo> { ...@@ -70,10 +70,10 @@ class IconsDemoState extends State<IconsDemo> {
} }
class _IconsDemoCard extends StatelessWidget { class _IconsDemoCard extends StatelessWidget {
const _IconsDemoCard(this.handleIconButtonPress, this.icon);
const _IconsDemoCard(this.handleIconButtonPress);
final VoidCallback handleIconButtonPress; final VoidCallback handleIconButtonPress;
final IconData icon;
Widget _buildIconButton(double iconSize, IconData icon, bool enabled) { Widget _buildIconButton(double iconSize, IconData icon, bool enabled) {
return new IconButton( return new IconButton(
...@@ -95,8 +95,8 @@ class _IconsDemoCard extends StatelessWidget { ...@@ -95,8 +95,8 @@ class _IconsDemoCard extends StatelessWidget {
return new TableRow( return new TableRow(
children: <Widget> [ children: <Widget> [
_centeredText(size.floor().toString()), _centeredText(size.floor().toString()),
_buildIconButton(size, Icons.face, true), _buildIconButton(size, icon, true),
_buildIconButton(size, Icons.face, false), _buildIconButton(size, icon, false),
], ],
); );
} }
......
...@@ -151,7 +151,7 @@ class Icon extends StatelessWidget { ...@@ -151,7 +151,7 @@ class Icon extends StatelessWidget {
switch (textDirection) { switch (textDirection) {
case TextDirection.rtl: case TextDirection.rtl:
iconWidget = new Transform( iconWidget = new Transform(
transform: new Matrix4.identity()..scale(-1.0), transform: new Matrix4.identity()..scale(-1.0, 1.0, 1.0),
alignment: Alignment.center, alignment: Alignment.center,
transformHitTests: false, transformHitTests: false,
child: iconWidget, child: iconWidget,
......
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