From ee8305ed52997202db15dadfc84a87957c30f53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=90=E9=BE=99=E5=B1=B1=E4=BA=BA?= Date: Tue, 15 Nov 2016 17:38:42 -0800 Subject: [PATCH] fix editbox can't input on macos 10.12 (#16842) * fix editbox can't input on macos 10.12 fix editbox can't input characters on mac os 10.12 * update external to 114 --- cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm | 2 ++ external/config.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm b/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm index 8811a75675..414650837e 100644 --- a/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm +++ b/cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm @@ -135,6 +135,8 @@ - (void)openKeyboard { [self.window.contentView addSubview:self.textInput]; + //FIXME: it will cause a few OpenGL error once, should be fix when glfw version upgraded. + self.window.contentView.wantsLayer = YES; if (![self.textInput isKindOfClass:[NSTextView class]]) { [self.textInput becomeFirstResponder]; }else { diff --git a/external/config.json b/external/config.json index d3b37e22c9..4ae31f64f9 100644 --- a/external/config.json +++ b/external/config.json @@ -1,5 +1,5 @@ { - "version":"v3-deps-113", + "version":"v3-deps-114", "zip_file_size":"135533806", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/",