From: Jinhyuk Jun Date: Wed, 3 Apr 2013 10:45:08 +0000 (+0900) Subject: Pagelayout : modify innerHeight dpr calculation in non scrollview mode X-Git-Tag: accepted/tizen_2.1/20130425.023924~3^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6d41bf01787ea35f190e6660cfc952cf6dcec9b;p=platform%2Fframework%2Fweb%2Fweb-ui-fw.git Pagelayout : modify innerHeight dpr calculation in non scrollview mode Change-Id: Ia68f9a13e03e00d51ef54c4bdab4e3c0b3f53380 --- diff --git a/src/js/widgets/jquery.mobile.tizen.pagelayout.js b/src/js/widgets/jquery.mobile.tizen.pagelayout.js index b70c01b..da9dcf1 100644 --- a/src/js/widgets/jquery.mobile.tizen.pagelayout.js +++ b/src/js/widgets/jquery.mobile.tizen.pagelayout.js @@ -282,9 +282,16 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { $elHeader = $elPage.find( ":jqmData(role='header')" ), $elFooter = $elPage.find( ":jqmData(role='footer')" ), $elContent = $elPage.find( ":jqmData(role='content')" ), - resultMinHeight; + resultMinHeight, + dpr = 1, + layoutInnerHeight = window.innerHeight; - resultMinHeight = window.innerHeight - $elHeader.height() - $elFooter.height(); + if ( !$.support.scrollview ) { + dpr = window.outerWidth / window.innerWidth; + layoutInnerHeight = Math.floor( window.outerHeight / dpr ); + } + + resultMinHeight = layoutInnerHeight - $elHeader.height() - $elFooter.height(); $elContent.css( "min-height", resultMinHeight - parseFloat( $elContent.css("padding-top") ) - parseFloat( $elContent.css("padding-bottom") ) + "px" ); }, @@ -330,7 +337,9 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { $elContent = $elPage.find( ":jqmData(role='content')" ), resultContentHeight = 0, resultFooterHeight = 0, - resultHeaderHeight = 0; + resultHeaderHeight = 0, + layoutInnerHeight = window.innerHeight, + dpr = 1; if ( $elPage.length ) { $elFooter = $elPage.find( ":jqmData(role='footer')" ); @@ -346,7 +355,12 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { $elFooter.css( "bottom", 0 ); } - resultContentHeight = window.innerHeight - resultFooterHeight - resultHeaderHeight; + if ( !$.support.scrollview ) { + dpr = window.outerWidth / window.innerWidth; + layoutInnerHeight = Math.floor( window.outerHeight / dpr ); + } + + resultContentHeight = layoutInnerHeight - resultFooterHeight - resultHeaderHeight; if ( $.support.scrollview ) { $elContent.height( resultContentHeight -