Revert "* [Core] Turn off FlatGUI." This reverts commit d75a181d27e75ba7b506fa325f265eb85f0ce0d9.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b4fb9d37 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b4fb9d37 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b4fb9d37 Branch: refs/heads/master Commit: b4fb9d37c7a82f63f1dc5cf765f912550680e7d5 Parents: a8e2cd9 Author: miomin <691292...@qq.com> Authored: Sat Apr 28 14:45:14 2018 +0800 Committer: YorkShen <shenyua...@gmail.com> Committed: Mon May 7 15:52:08 2018 +0800 ---------------------------------------------------------------------- .../com/taobao/weex/ui/view/WXFrameLayout.java | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b4fb9d37/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java index fdf4eb0..fce7dcc 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXFrameLayout.java @@ -94,22 +94,22 @@ public class WXFrameLayout extends FrameLayout implements WXGestureObservable,IR return mWidgets != null || super.verifyDrawable(who); } -// @Override -// protected void dispatchDraw(Canvas canvas) { -// try { -// if (mWidgets != null) { -// canvas.save(); -// canvas.translate(getPaddingLeft(), getPaddingTop()); -// for (Widget widget : mWidgets) { -// widget.draw(canvas); -// } -// canvas.restore(); -// } else { -// WXViewUtils.clipCanvasWithinBorderBox(this, canvas); -// super.dispatchDraw(canvas); -// } -// }catch (Throwable e){ -// WXLogUtils.e("FlatGUI Crashed when dispatchDraw", WXLogUtils.getStackTrace(e)); -// } -// } + @Override + protected void dispatchDraw(Canvas canvas) { + try { + if (mWidgets != null) { + canvas.save(); + canvas.translate(getPaddingLeft(), getPaddingTop()); + for (Widget widget : mWidgets) { + widget.draw(canvas); + } + canvas.restore(); + } else { + WXViewUtils.clipCanvasWithinBorderBox(this, canvas); + super.dispatchDraw(canvas); + } + }catch (Throwable e){ + WXLogUtils.e("FlatGUI Crashed when dispatchDraw", WXLogUtils.getStackTrace(e)); + } + } }