controller: modify parent widget for general-purpose controller
authorGiWoong Kim <giwoong.kim@samsung.com>
Fri, 20 Nov 2015 06:33:04 +0000 (15:33 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Mon, 23 Nov 2015 07:22:26 +0000 (16:22 +0900)
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>
tizen/src/ui/controller/floatingconview.cpp

index 416d7f53627642022c84740a8ecb4b2f6039f72d..674e13519a24ebb5faacbd02daaf33405ce7bcf4 100644 (file)
@@ -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);
     }
 }