controller: modify inheritance of docking controller class

DockingConView -> QWidget

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

diff --git a/tizen/src/ui/dockingcontroller.cpp b/tizen/src/ui/dockingcontroller.cpp
index 8c2a811f95cebb648a6be373f490869c1455c490..fa1dd45903a371a79d1e33c146940f7f6cd9c87f 100644 (file)
--- a/tizen/src/ui/dockingcontroller.cpp
+++ b/tizen/src/ui/dockingcontroller.cpp
@@ -30,16 +30,26 @@
 #include "dockingcontroller.h"
 #include "mainwindow.h"
 
-DockingController::DockingController(int dockPos, ControllerForm *conForm,
-    QGraphicsScene *conScene, QAction *menu, QWidget *parent)
-        : DockingConView(conForm, conScene, parent)
+DockingController::DockingController(ControllerForm *conForm,
+    QAction *menu, int dockPos, QWidget *parent) : QWidget(parent)
 {
-    this->dockPos = dockPos;
     this->conForm = conForm;
     this->menu = menu;
+    this->dockPos = dockPos;
 
+    setStyleSheet("border-style: none");
     setAttribute(Qt::WA_DeleteOnClose);
-    setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->setMargin(0);
+    layout->setSpacing(0);
+
+    QGraphicsScene *conScene = new QGraphicsScene(this);
+    conScene->setBackgroundBrush(Qt::black);
+
+    conView = new DockingConView(conForm, conScene, this);
+    conView->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    layout->addWidget(conView);
 }
 
 int DockingController::getDockPos()

diff --git a/tizen/src/ui/dockingcontroller.h b/tizen/src/ui/dockingcontroller.h
index ddd9b0deddcf25c775c8efaf29f40334854415fd..b218f8c9048bd0efac8093c8a5e48522b5e5914d 100644 (file)
--- a/tizen/src/ui/dockingcontroller.h
+++ b/tizen/src/ui/dockingcontroller.h
@@ -35,13 +35,13 @@
 #include "controllerform.h"
 #include "dockingconview.h"
 
-class DockingController : public DockingConView
+class DockingController : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit DockingController(int dockPos, ControllerForm *conForm,
-        QGraphicsScene *conScene, QAction *menu, QWidget *parent = 0);
+    explicit DockingController(ControllerForm *conForm,
+        QAction *menu, int dockPos, QWidget *parent = 0);
     ~DockingController();
 
     int getDockPos();
@@ -53,9 +53,10 @@ protected:
     void setRegion(QImage baseImage);
 
 private:
-    int dockPos;
+    DockingConView *conView;
     ControllerForm *conForm;
     QAction *menu;
+    int dockPos;
 };
 
 #endif // DOCKINGCONTROLLER_H

diff --git a/tizen/src/ui/dockingconview.cpp b/tizen/src/ui/dockingconview.cpp
index d69ede3eba22e77dc5e16e8cd5736a9722ce57e0..e56c514f9cff3c99b3a130ddf2c2daaf394ef64a 100644 (file)
--- a/tizen/src/ui/dockingconview.cpp
+++ b/tizen/src/ui/dockingconview.cpp
@@ -31,8 +31,8 @@
 #include "mainwindow.h"
 #include "skinkeyitem.h"
 
-DockingConView::DockingConView(ControllerForm *conForm, QGraphicsScene *scene, QWidget *parent) :
-    QGraphicsView(scene, parent)
+DockingConView::DockingConView(ControllerForm *conForm, QGraphicsScene *scene, QWidget *parent)
+    : QGraphicsView(scene, parent)
 {
     setStyleSheet("background: transparent");
     setStyleSheet("border-style: none");
@@ -83,11 +83,11 @@ void DockingConView::mousePressEvent(QMouseEvent *event)
     }
 
     if (event->button() == Qt::LeftButton) {
-        QWidget *win = ((QWidget *) this->parent());
+        QWidget *win = ((QWidget *)this->parent()->parent());
 
         grabPos = event->globalPos();
         eventPos = event->pos();
-        rubberPos = win->pos() + this->pos();
+        rubberPos = win->pos() + ((QWidget *)this->parent())->pos();
 
         if (rubberBand != NULL) {
             rubberBand->setGeometry(QRect(rubberPos, size()));
@@ -111,7 +111,7 @@ void DockingConView::mouseReleaseEvent(QMouseEvent *event)
             }
 
             /* toggle */
-            MainWindow *win = ((MainWindow *)this->parent());
+            MainWindow *win = ((MainWindow *)this->parent()->parent());
             win->getUIState()->conState.recentlyFloatPos = event->globalPos() - eventPos;
 
             win->openController(win->getUIState()->conState.conFormIndex, -1);

diff --git a/tizen/src/ui/dockingconview.h b/tizen/src/ui/dockingconview.h
index dc1b6ff9d5258882b5edaf91d7c2193c5cc44b7e..e4dc7d0c488b07272420e28ebfc876fc24ef3d9d 100644 (file)
--- a/tizen/src/ui/dockingconview.h
+++ b/tizen/src/ui/dockingconview.h
@@ -44,7 +44,6 @@ public:
 
 protected:
     void resizeEvent(QResizeEvent *event);
-
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);

diff --git a/tizen/src/ui/floatingcontroller.cpp b/tizen/src/ui/floatingcontroller.cpp
index dc2cc0ceb370c5580116bbfdb55a14da1f2857d0..36091f5c19218a80470904ed9b4878b4555e9f0c 100644 (file)
--- a/tizen/src/ui/floatingcontroller.cpp
+++ b/tizen/src/ui/floatingcontroller.cpp
@@ -47,6 +47,7 @@ FloatingController::FloatingController(ControllerForm *conForm,
     layout->setSpacing(0);
 
     QGraphicsScene *conScene = new QGraphicsScene(this);
+    conScene->setBackgroundBrush(Qt::black);
 
     conView = new FloatingConView(conForm, conScene, this);
     conView->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);

diff --git a/tizen/src/ui/floatingconview.cpp b/tizen/src/ui/floatingconview.cpp
index c79df1baa742752c255fc7f7ff9fedb61baa7dfc..16038b7e398693fa2f194e7b32bbb763fbaf11dc 100644 (file)
--- a/tizen/src/ui/floatingconview.cpp
+++ b/tizen/src/ui/floatingconview.cpp
@@ -33,8 +33,8 @@
 
 #define DOCKABLE_AREA_WIDTH 30
 
-FloatingConView::FloatingConView(ControllerForm *conForm, QGraphicsScene *scene, QWidget *parent) :
-    QGraphicsView(scene, parent)
+FloatingConView::FloatingConView(ControllerForm *conForm, QGraphicsScene *scene, QWidget *parent)
+    : QGraphicsView(scene, parent)
 {
     setStyleSheet("background: transparent");
     setStyleSheet("border-style: none");

diff --git a/tizen/src/ui/floatingconview.h b/tizen/src/ui/floatingconview.h
index 506a3890744fc420268b5aa95b76d39c3fd0e621..02830e1da4c6002508e35db949eb97975fcd8313 100644 (file)
--- a/tizen/src/ui/floatingconview.h
+++ b/tizen/src/ui/floatingconview.h
@@ -41,12 +41,13 @@ public:
     ~FloatingConView();
 
 protected:
-    int isDockable(QWidget *object, QWidget *subject);
     void resizeEvent(QResizeEvent *event);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
 
+    int isDockable(QWidget *object, QWidget *subject);
+
     QPoint grabPos;
     QPoint conPos;
 

diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp
index 3599c49bc780246308b9f1cdaa9d02671cfc0d46..08819c9e38589958b09a5b07bc0f7887fe6da805 100644 (file)
--- a/tizen/src/ui/mainwindow.cpp
+++ b/tizen/src/ui/mainwindow.cpp
@@ -236,10 +236,8 @@ void MainWindow::openController(int index, int dockPos)
         getUIState()->conState.floatingCon =
             new FloatingController(conForm, action, this);
     } else {
-        conScene = new QGraphicsScene(this);
-        conScene->setBackgroundBrush(Qt::black);
         getUIState()->conState.dockingCon =
-            new DockingController(dockPos, conForm, conScene, action, this);
+            new DockingController(conForm, action, dockPos, this);
     }
 
     /* update layout */
@@ -273,10 +271,6 @@ void MainWindow::closeController()
         getDockingCon()->close();
         getUIState()->conState.dockingCon = NULL;
 
-        conScene->clear();
-        delete conScene;
-        conScene = NULL;
-
         adjustSize();
     }
 

diff --git a/tizen/src/ui/mainwindow.h b/tizen/src/ui/mainwindow.h
index 4dfc19b79075de2cf40440709e8dcccfbceaab6c..e68c1d33de47927e047ec3596f4f64c725aaffa6 100644 (file)
--- a/tizen/src/ui/mainwindow.h
+++ b/tizen/src/ui/mainwindow.h
@@ -100,7 +100,6 @@ private:
     /* windowing */
     QHBoxLayout *winLayout;
     QGraphicsScene *skinScene;
-    QGraphicsScene *conScene; /* for docking controller */
     SkinView* skinView;
     DisplayBase *display;
     ContextMenu *popupMenu;