From 0880e856eea164d14bc8f75628efffa0f8efd942 Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Wed, 23 Dec 2015 14:36:06 +0900 Subject: [PATCH] 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 (cherry picked from commit 8972ab7c2910549bf023930b4bf6be47b58a5a50) --- tizen/src/ui/controller/dockingcontroller.cpp | 1 + tizen/src/ui/controller/floatingcontroller.cpp | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tizen/src/ui/controller/dockingcontroller.cpp b/tizen/src/ui/controller/dockingcontroller.cpp index 3e9a98366e..d50cafbeb8 100644 --- 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 bc9d76b212..132d168cd1 100644 --- 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); -- 2.34.1