--- a/src/hbcore/vkbhosts/private/hbvkbgeometrylogic_p.h	Fri Sep 17 08:32:10 2010 +0300
+++ b/src/hbcore/vkbhosts/private/hbvkbgeometrylogic_p.h	Mon Oct 04 00:38:12 2010 +0300
@@ -34,11 +34,11 @@
 class HbVkbGeometryLogicPrivate
 {
 public:
-
     HbVkbGeometryLogicPrivate(
             const QSizeF& screenSize,
             const QSizeF& keypadSize,
-            const QRectF& sceneArea,
+            const QRectF& viewArea,
+            bool isPopupType,
             bool isVkbOpen,
             bool hideTitlebar,
             bool hideStatusbar,
@@ -59,17 +59,24 @@
 
 private:
 
+    bool minimunMovement(QPointF& vector) const;
+    bool calculateVectorToVisibleArea(QPointF& vector, const QRectF& areaToMove) const;
     bool fitsArea(const QRectF& target, const QRectF& source) const;
+    bool calculateContainerVector(QPointF& vector) const;
+    bool calculatePopupVector(QPointF& vector) const;
+    bool calculateEditorVector(QPointF& vector) const;
 
 public:
 
 // Data
 
+    QRectF mViewArea;
     QRectF mVisibleArea;
     QRectF mContainerArea;
     QRectF mEditorArea;
     QRectF mCursorArea;
     qreal mAdjust;
+    bool mIsPopupType;
 };
 
 #endif // HBVKBGEOMETRYLOGIC_P_H