DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #489 from eseidelGoogle/roll_mojo

Browse Source 
Roll mojo to 35de44e361
This commit is contained in:
Eric Seidel 2015-08-06 16:22:15 -07:00
commit 93cfdf2553
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter/lib/editing/input.dart
View File

@ -59,7 +59,7 @@ class Input extends StatefulComponent {
bool focused = Focus.at(this);
if (focused && !_keyboardHandle.attached) {
_keyboardHandle = keyboard.show(_editableValue.stub);
_keyboardHandle = keyboard.show(_editableValue.stub, KeyboardType_TEXT);
} else if (!focused && _keyboardHandle.attached) {
_keyboardHandle.release();
}

9
packages/flutter/lib/mojo/keyboard.dart
View File

@ -4,6 +4,7 @@
import 'package:mojo_services/keyboard/keyboard.mojom.dart';
import 'package:sky/mojo/shell.dart' as shell;
export 'package:mojo_services/keyboard/keyboard.mojom.dart';
class _KeyboardConnection {
@ -29,14 +30,14 @@ class Keyboard {
KeyboardHandle _currentHandle;
KeyboardHandle show(KeyboardClientStub stub) {
KeyboardHandle show(KeyboardClientStub stub, int keyboardType) {
assert(stub != null);
if (_currentHandle != null) {
if (_currentHandle.stub == stub)
return _currentHandle;
_currentHandle.release();
}
_currentHandle = new KeyboardHandle._show(this, stub);
_currentHandle = new KeyboardHandle._show(this, stub, keyboardType);
return _currentHandle;
}
@ -44,8 +45,8 @@ class Keyboard {
class KeyboardHandle {
KeyboardHandle._show(Keyboard keyboard, this.stub) : _keyboard = keyboard {
_keyboard.service.show(stub);
KeyboardHandle._show(Keyboard keyboard, this.stub, int keyboardType) : _keyboard = keyboard {
_keyboard.service.show(stub, keyboardType);
_attached = true;
}

4
packages/flutter/pubspec.yaml
View File

@ -6,8 +6,8 @@ homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky
dependencies:
cassowary: ^0.1.7
material_design_icons: ^0.0.2
mojo_services: 0.0.21
mojo: 0.0.21
mojo_services: 0.0.22
mojo: 0.0.22
newton: ^0.1.2
sky_engine: ^0.0.6
sky_services: ^0.0.6