Commit 93cfdf25 authored by Eric Seidel's avatar Eric Seidel

Merge pull request #489 from eseidelGoogle/roll_mojo

Roll mojo to https://github.com/domokit/mojo/commit/35de44e3618d508b2b3862af2216aee8c70ad8e5 
parents 3fecfa75 e9135808
...@@ -59,7 +59,7 @@ class Input extends StatefulComponent { ...@@ -59,7 +59,7 @@ class Input extends StatefulComponent {
bool focused = Focus.at(this); bool focused = Focus.at(this);
if (focused && !_keyboardHandle.attached) { if (focused && !_keyboardHandle.attached) {
_keyboardHandle = keyboard.show(_editableValue.stub); _keyboardHandle = keyboard.show(_editableValue.stub, KeyboardType_TEXT);
} else if (!focused && _keyboardHandle.attached) { } else if (!focused && _keyboardHandle.attached) {
_keyboardHandle.release(); _keyboardHandle.release();
} }
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
import 'package:mojo_services/keyboard/keyboard.mojom.dart'; import 'package:mojo_services/keyboard/keyboard.mojom.dart';
import 'package:sky/mojo/shell.dart' as shell; import 'package:sky/mojo/shell.dart' as shell;
export 'package:mojo_services/keyboard/keyboard.mojom.dart';
class _KeyboardConnection { class _KeyboardConnection {
...@@ -29,14 +30,14 @@ class Keyboard { ...@@ -29,14 +30,14 @@ class Keyboard {
KeyboardHandle _currentHandle; KeyboardHandle _currentHandle;
KeyboardHandle show(KeyboardClientStub stub) { KeyboardHandle show(KeyboardClientStub stub, int keyboardType) {
assert(stub != null); assert(stub != null);
if (_currentHandle != null) { if (_currentHandle != null) {
if (_currentHandle.stub == stub) if (_currentHandle.stub == stub)
return _currentHandle; return _currentHandle;
_currentHandle.release(); _currentHandle.release();
} }
_currentHandle = new KeyboardHandle._show(this, stub); _currentHandle = new KeyboardHandle._show(this, stub, keyboardType);
return _currentHandle; return _currentHandle;
} }
...@@ -44,8 +45,8 @@ class Keyboard { ...@@ -44,8 +45,8 @@ class Keyboard {
class KeyboardHandle { class KeyboardHandle {
KeyboardHandle._show(Keyboard keyboard, this.stub) : _keyboard = keyboard { KeyboardHandle._show(Keyboard keyboard, this.stub, int keyboardType) : _keyboard = keyboard {
_keyboard.service.show(stub); _keyboard.service.show(stub, keyboardType);
_attached = true; _attached = true;
} }
......
...@@ -6,8 +6,8 @@ homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky ...@@ -6,8 +6,8 @@ homepage: https://github.com/domokit/sky_engine/tree/master/sky/packages/sky
dependencies: dependencies:
cassowary: ^0.1.7 cassowary: ^0.1.7
material_design_icons: ^0.0.2 material_design_icons: ^0.0.2
mojo_services: 0.0.21 mojo_services: 0.0.22
mojo: 0.0.21 mojo: 0.0.22
newton: ^0.1.2 newton: ^0.1.2
sky_engine: ^0.0.6 sky_engine: ^0.0.6
sky_services: ^0.0.6 sky_services: ^0.0.6
......
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