controller: define fixed size for controller view

Emulator window obtains a consistent display result by define
fixed size for controller view. The controller of emulator does
not have to adjustable size.

Change-Id: I79b206b19aff46e7a5088de23cae250bfec9765b
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
(cherry picked from commit 8972ab7c2910549bf023930b4bf6be47b58a5a50)

diff --git a/tizen/src/ui/controller/dockingcontroller.cpp b/tizen/src/ui/controller/dockingcontroller.cpp
index 3e9a98366e99b08add5b66f20204f0d41d29d3f7..d50cafbeb82ce7defcda84791fca07dbfc65bd8f 100644 (file)
--- a/tizen/src/ui/controller/dockingcontroller.cpp
+++ b/tizen/src/ui/controller/dockingcontroller.cpp
@@ -45,6 +45,7 @@ DockingController::DockingController(ControllerForm *conForm,
 
     conView = new DockingConView(this, conForm, conScene);
     conView->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    conView->resize(conForm->skinImg[LayoutForm::normal].size());
 }
 
 ControllerForm *DockingController::getConForm()

diff --git a/tizen/src/ui/controller/floatingcontroller.cpp b/tizen/src/ui/controller/floatingcontroller.cpp
index bc9d76b212c906a516887c016dcb9f8c6e3820fa..132d168cd171b21afec871f299fa701883cbca96 100644 (file)
--- a/tizen/src/ui/controller/floatingcontroller.cpp
+++ b/tizen/src/ui/controller/floatingcontroller.cpp
@@ -38,20 +38,13 @@ FloatingController::FloatingController(ControllerForm *conForm,
 
     setStyleSheet("border-style: none");
     setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog);
-
     setWindowTitle(conForm->getName());
 
-    QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setMargin(0);
-    layout->setSpacing(0);
-    layout->setSizeConstraint(QLayout::SetFixedSize);
-
     QGraphicsScene *conScene = new QGraphicsScene(this);
     conScene->setBackgroundBrush(Qt::black);
 
     conView = new FloatingConView(this, conForm, conScene);
-    conView->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-    layout->addWidget(conView);
+    conView->resize(conForm->skinImg[LayoutForm::normal].size());
 }
 
 ControllerForm *FloatingController::getConForm()
@@ -75,7 +68,7 @@ void FloatingController::showEvent(QShowEvent *event)
     if (baseImage->isNull() == true) {
         qWarning("invalid image for region");
     } else {
-        setMask(QRegion(QBitmap::fromImage(baseImage->createAlphaMask())));
+        setMask(QBitmap::fromImage(baseImage->createAlphaMask()));
     }
 
     QWidget::showEvent(event);