From: GiWoong Kim <giwoong.kim@samsung.com>
Date: Fri, 20 Nov 2015 06:33:04 +0000 (+0900)
Subject: controller: modify parent widget for general-purpose controller
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~152
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c767c40f2399af1f887ea188d14575b60d46e79;p=sdk%2Femulator%2Fqemu.git

controller: modify parent widget for general-purpose controller

GeneralPurposeCon gets constrained by FloatingController's
geometry while floating. So, FloatingConView should be replaced
by the FloatingController as a proper parent widget.

Change-Id: Ic670b163b63d2777b3413a5c1f159c4c7e6ff11a
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
---

diff --git a/tizen/src/ui/controller/floatingconview.cpp b/tizen/src/ui/controller/floatingconview.cpp
index 416d7f5362..674e13519a 100644
--- a/tizen/src/ui/controller/floatingconview.cpp
+++ b/tizen/src/ui/controller/floatingconview.cpp
@@ -65,13 +65,15 @@ void FloatingConView::createItems(ControllerForm *conForm)
             }
         }
     } else {
-        GeneralPurposeCon *generalCon = new GeneralPurposeCon(this, keyList,
-            QSize(conForm->getCenteralRect().width(),
-                conForm->getCenteralRect().height() -
-                (GPC_HEAD_SPACING + GPC_TAIL_SPACING)));
+        QSize conSize(conForm->getCenteralRect().width(),
+            conForm->getCenteralRect().height() - (GPC_HEAD_SPACING + GPC_TAIL_SPACING));
 
-        QPoint topLeft = conForm->getCenteralRect().topLeft();
-            generalCon->move(topLeft.x(), topLeft.y() + GPC_HEAD_SPACING);
+        GeneralPurposeCon *generalCon =
+            new GeneralPurposeCon(parentWidget(), keyList, conSize);
+
+        generalCon->resize(conSize);
+        const QPoint topLeft = conForm->getCenteralRect().topLeft();
+        generalCon->move(topLeft.x(), topLeft.y() + GPC_HEAD_SPACING);
     }
 }