Skip to content

Commit b83894f

Browse files
authored
Merge pull request #1183 from kusma/fuse-views-back-button
Fuse.Nodes: do not use KeyboardBootstrapper with Fuse.Views
2 parents d3e9b2c + edb47c2 commit b83894f

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
## WrapPanel / WrapLayout
4848
- Fixed `WrapPanel` to update its layout when a layout property changes.
4949

50+
## Fuse.Views
51+
- Fixed a crash when pushing the back-button on Android.
52+
5053

5154
# 1.8
5255

Source/Fuse.Nodes/MobileBootstrapping.uno

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@ namespace Fuse
1717
Fuse.Platform.Lifecycle.ExitedInteractive += OnExitInteractive;
1818
Fuse.Platform.Lifecycle.Terminating += OnTerminating;
1919

20-
Uno.Platform.EventSources.HardwareKeys.KeyDown += KeyboardBootstrapper.OnKeyPressed;
21-
Uno.Platform.EventSources.HardwareKeys.KeyUp += KeyboardBootstrapper.OnKeyReleased;
20+
if defined(Mobile && !Library)
21+
{
22+
Uno.Platform.EventSources.HardwareKeys.KeyDown += KeyboardBootstrapper.OnKeyPressed;
23+
Uno.Platform.EventSources.HardwareKeys.KeyUp += KeyboardBootstrapper.OnKeyReleased;
24+
}
2225
}
2326

2427
static void OnTerminating(Fuse.Platform.ApplicationState state)

0 commit comments

Comments
 (0)