From 4030cfb5b6788f115054aa8753248e6f7aa7ab37 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Mon, 18 Oct 2010 16:50:06 +0200
Subject: Use the real screen size in meegographics surface scaling, not
 hardcoded one.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 864
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp b/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
index f9f14ae..b42a7ea 100644
--- a/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
@@ -42,7 +42,8 @@
 #include <QDebug>
 #include <QEvent>
 #include <QMouseEvent>
-#include <QCoreApplication>
+#include <QApplication>
+#include <QDesktopWidget>
 #include "qmeegooverlaywidget.h"
 #include "qmeegographicssystemhelper.h"
 #include "qmeegoruntime.h"
@@ -54,10 +55,12 @@ QMeeGoOverlayWidget::QMeeGoOverlayWidget(int surfaceWidth, int surfaceHeight, QW
     if (! QMeeGoGraphicsSystemHelper::isRunningMeeGo())
         qFatal("QMeeGoOverlayWidget can only be used when running with 'meego' graphics system!");
 
+    const QRect desktop = QApplication::desktop()->screenGeometry(parent);
+
     QMeeGoRuntime::setSurfaceFixedSize(surfaceWidth, surfaceHeight);
 
-    scaleW = sw / 864.0;
-    scaleH = sh / 480.0;
+    scaleW = sw / desktop.width();
+    scaleH = sh / desktop.height();
     installEventFilter(this);
 }
 
-- 
cgit v0.12