scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-28 18:15:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #247 from yueyuzhao/dev-fix-ios-whole-window-scroll

Browse source 
iOS: disable UIWebView scroll to fix #243
This commit is contained in:
chrisgarrity 2020-04-02 09:58:30 -04:00 committed by GitHub
commit 3c80bb2f81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editions/free/src/css/librarymodal.css
View file

@ -145,6 +145,8 @@ Assets chooser
margin: ${css_vh(0.00)}; margin: ${css_vh(0.00)};
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
height: ${css_vh(88.28)};
overflow-y: scroll;
} }
*.scrollarea{ *.scrollarea{

5
ios/ScratchJr/src/ViewController.m
View file

@ -28,6 +28,11 @@ JSContext *js;
[super viewDidLoad]; [super viewDidLoad];
[self registerDefaultsFromSettingsBundle]; [self registerDefaultsFromSettingsBundle];
webview = (UIWebView*)[self view] ; webview = (UIWebView*)[self view] ;
// disable webview scroll
// to fix https://github.com/LLK/scratchjr/issues/243
webview.scrollView.scrollEnabled = false;
[webview setDelegate:self]; [webview setDelegate:self];
[Database open:@"ScratchJr"]; [Database open:@"ScratchJr"];
[ScratchJr cameraInit]; [ScratchJr cameraInit];