Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix WebView and VideoPlayer in wrong place on Android 2.3.x

This commit is contained in:
Dhilan007 2014-11-13 18:15:41 +08:00
parent 706f49cb59
commit 5a8ac8f151
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java
View File

@ -27,6 +27,7 @@ import android.media.MediaPlayer;
import android.media.MediaPlayer.OnErrorListener; import android.media.MediaPlayer.OnErrorListener;
import android.net.Uri; import android.net.Uri;
import android.util.Log; import android.util.Log;
import android.view.Gravity;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
@ -360,6 +361,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl
FrameLayout.LayoutParams.WRAP_CONTENT); FrameLayout.LayoutParams.WRAP_CONTENT);
lParams.leftMargin = mVisibleLeft; lParams.leftMargin = mVisibleLeft;
lParams.topMargin = mVisibleTop; lParams.topMargin = mVisibleTop;
lParams.gravity = Gravity.TOP | Gravity.LEFT;
setLayoutParams(lParams); setLayoutParams(lParams);
} }

12
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxWebView.java
View File

@ -6,6 +6,7 @@ import java.net.URI;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import android.view.Gravity;
import android.webkit.WebChromeClient; import android.webkit.WebChromeClient;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
@ -77,18 +78,15 @@ public class Cocos2dxWebView extends WebView {
Cocos2dxWebViewHelper._didFailLoading(viewTag, failingUrl); Cocos2dxWebViewHelper._didFailLoading(viewTag, failingUrl);
} }
} }
public void setWebViewRect(int left, int top, int maxWidth, int maxHeight) { public void setWebViewRect(int left, int top, int maxWidth, int maxHeight) {
fixSize(left, top, maxWidth, maxHeight);
}
private void fixSize(int left, int top, int width, int height) {
FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
FrameLayout.LayoutParams.WRAP_CONTENT); FrameLayout.LayoutParams.WRAP_CONTENT);
layoutParams.leftMargin = left; layoutParams.leftMargin = left;
layoutParams.topMargin = top; layoutParams.topMargin = top;
layoutParams.width = width; layoutParams.width = maxWidth;
layoutParams.height = height; layoutParams.height = maxHeight;
layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
this.setLayoutParams(layoutParams); this.setLayoutParams(layoutParams);
} }
} }