From 9bb886e9a867b77cb053cb0ac5a4c98463b23b8d Mon Sep 17 00:00:00 2001 From: Donald Date: Tue, 24 Mar 2020 21:00:09 +0800 Subject: [PATCH 1/2] iOS: disable UIWebView scroll to fix #243 --- ios/ScratchJr/src/ViewController.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ios/ScratchJr/src/ViewController.m b/ios/ScratchJr/src/ViewController.m index 721fd28..064f226 100644 --- a/ios/ScratchJr/src/ViewController.m +++ b/ios/ScratchJr/src/ViewController.m @@ -28,6 +28,11 @@ JSContext *js; [super viewDidLoad]; [self registerDefaultsFromSettingsBundle]; webview = (UIWebView*)[self view] ; + + // disable webview scroll + // to fix https://github.com/LLK/scratchjr/issues/243 + webview.scrollView.scrollEnabled = false; + [webview setDelegate:self]; [Database open:@"ScratchJr"]; [ScratchJr cameraInit]; From d56ff035b07b83011671f3bd0225c5398c9c65cb Mon Sep 17 00:00:00 2001 From: Donald Date: Tue, 31 Mar 2020 07:40:26 +0800 Subject: [PATCH 2/2] fix library not scrolling --- editions/free/src/css/librarymodal.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/editions/free/src/css/librarymodal.css b/editions/free/src/css/librarymodal.css index 6dbf6f7..7850f3d 100644 --- a/editions/free/src/css/librarymodal.css +++ b/editions/free/src/css/librarymodal.css @@ -145,6 +145,8 @@ Assets chooser margin: ${css_vh(0.00)}; margin-left: auto; margin-right: auto; + height: ${css_vh(88.28)}; + overflow-y: scroll; } *.scrollarea{