aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorKostas Nakos2007-04-30 21:12:57 +0000
committerKostas Nakos2007-04-30 21:12:57 +0000
commite3eb62b1a87b55616ccb76133f4791a9a1a844a2 (patch)
tree4f5cf42805ff87058b2dee51058fce3106c1c6d1 /backends/platform
parent7b614f3ee9154740a2582aad2fccf309303d0dde (diff)
downloadscummvm-rg350-e3eb62b1a87b55616ccb76133f4791a9a1a844a2.tar.gz
scummvm-rg350-e3eb62b1a87b55616ccb76133f4791a9a1a844a2.tar.bz2
scummvm-rg350-e3eb62b1a87b55616ccb76133f4791a9a1a844a2.zip
correct place for touche screen size adjustment & one more check in the draw loop
svn-id: r26685
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/wince/wince-sdl.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index 76a8496781..adce2e956a 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -927,6 +927,9 @@ void OSystem_WINCE3::initSize(uint w, uint h) {
if (w == 320 && h == 200 && !_hasSmartphoneResolution)
h = 240; // use the extra 40 pixels height for the toolbar
+ if (h == 400) // touche engine fixup
+ h += 80;
+
if (!_hasSmartphoneResolution)
if (h == 240)
_toolbarHandler.setOffset(200);
@@ -1192,8 +1195,7 @@ void OSystem_WINCE3::loadGFXMode() {
displayWidth = _screenWidth;
displayHeight = _screenHeight;
}
- if (_screenHeight == 400) // touche engine fixup
- displayHeight += 80 * _scaleFactorYm / _scaleFactorYd;
+
switch (_orientationLandscape) {
case 1:
flags |= SDL_LANDSCVIDEO;
@@ -1462,6 +1464,10 @@ void OSystem_WINCE3::internUpdateScreen() {
// note that all current scalers do not make dst rect exceed left/right, unless chosen badly (FIXME)
if (_zoomDown) routy -= 240; // adjust for zoom position
if (routy + routh < 0) continue;
+ if (routy < 0) {
+ routh += routy;
+ routy = 0;
+ }
if (_orientationLandscape) {
if (routy > _platformScreenWidth) continue;
if (routy + routh > _platformScreenWidth) {