Skip to content

fixed #2454 Fixed a bug of EditBox that position is wrong when _resolutionPolicy of EGLView is NOBORDER #1045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2013
Merged

fixed #2454 Fixed a bug of EditBox that position is wrong when _resolutionPolicy of EGLView is NOBORDER #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion cocos2d/base_nodes/CCdomNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,40 @@ cc.DOM.methods = /** @lends cc.DOM# */{
}
}
};

cc.DOM._resetEGLViewDiv = function(){
var eglViewDiv = cc.$("#EGLViewDiv");
if(eglViewDiv){
var eglViewer = cc.EGLView.getInstance();
var designSize = eglViewer.getDesignResolutionSize();
var viewPortRect = eglViewer.getViewPortRect();
var screenSize = eglViewer.getFrameSize();
var designSizeWidth = designSize.width, designSizeHeight = designSize.height;
if((designSize.width === 0) && (designSize.height === 0)){
designSizeWidth = screenSize.width;
designSizeHeight = screenSize.height;
}

var viewPortWidth = viewPortRect.size.width, viewPortHeight = viewPortRect.size.height;
if((viewPortRect.size.width === 0) && (viewPortRect.size.height === 0)){
viewPortWidth = screenSize.width;
viewPortHeight = screenSize.height;
}

eglViewDiv.style.position = 'absolute';
eglViewDiv.style.bottom = 0;
//x.dom.style.display='block';
eglViewDiv.style.width = designSizeWidth + "px";
eglViewDiv.style.maxHeight = designSizeHeight + "px";
eglViewDiv.style.margin = 0;

eglViewDiv.resize(eglViewer.getScaleX(), eglViewer.getScaleY());
eglViewDiv.style.left = ((viewPortWidth - designSizeWidth) / 2
+ (screenSize.width - viewPortWidth ) / 2) + "px";
eglViewDiv.style.bottom = ((screenSize.height - viewPortHeight ) / 2) + "px";
}
};

/**
* @function
* @private
Expand Down Expand Up @@ -349,7 +383,7 @@ cc.DOM.parentDOM = function (x) {
eglViewDiv.style.maxHeight = designSizeHeight + "px";
eglViewDiv.style.margin = 0;

eglViewDiv.resize(eglViewer.getScaleX(), eglViewer.getScaleX());
eglViewDiv.resize(eglViewer.getScaleX(), eglViewer.getScaleY());
eglViewDiv.style.left = ((viewPortWidth - designSizeWidth) / 2
+ (screenSize.width - viewPortWidth ) / 2) + "px";
eglViewDiv.style.bottom = ((screenSize.height - viewPortHeight ) / 2) + "px";
Expand Down
1 change: 1 addition & 0 deletions cocos2d/platform/CCEGLView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ cc.EGLView = cc.Class.extend(/** @lends cc.EGLView# */{
director._createStatsLabel();
director.setGLDefaultValues();
}
cc.DOM._resetEGLViewDiv();
},

/**
Expand Down