display: no need to consider multi-touch drawing when mouse enabled

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

diff --git a/tizen/src/ui/displayswwidget.cpp b/tizen/src/ui/displayswwidget.cpp
index c5b1fb8fae3ec4f387168600e297977a48e098b8..114dbed4c48172974db2691c3fb6fcfd18cb3525 100644 (file)
--- a/tizen/src/ui/displayswwidget.cpp
+++ b/tizen/src/ui/displayswwidget.cpp
@@ -40,8 +40,6 @@ DisplaySWWidget::DisplaySWWidget(QWidget *parent,
     DisplayType *displayForm, QSize resolution, qreal scaleFactor) :
     QLabel(parent), DisplayBase(displayForm, resolution, scaleFactor, this)
 {
-    this->mtTracker = getTouchScreenHelper()->getMtTracker();
-
     /* fill the screen with black surface */
     QPixmap initImage(
         displayForm->getRect().width() * scaleFactor,
@@ -50,18 +48,14 @@ DisplaySWWidget::DisplaySWWidget(QWidget *parent,
     setPixmap(initImage);
 }
 
-/* override */
-void DisplaySWWidget::paintEvent(QPaintEvent *event)
+void DisplaySWWidget::drawMtPoints(QPainter &painter)
 {
-    QLabel::paintEvent(event);
-    handlePaint(event);
-
-    /* draw multi-touch points */
-    QPainter painter(this);
-
+    MultiTouchTracker *mtTracker = getTouchScreenHelper()->getMtTracker();
     QList<TouchPoint *> pointList = mtTracker->getTouchPointList();
+    TouchPoint *point = NULL;
+
     for (int i = 0; i < pointList.count(); i++) {
-        TouchPoint *point = pointList.at(i);
+        point = pointList.at(i);
         if (point != NULL) {
             painter.drawImage(
                 point->getHostPos().x() - mtTracker->getPointRadius(),
@@ -71,6 +65,19 @@ void DisplaySWWidget::paintEvent(QPaintEvent *event)
     }
 }
 
+/* override */
+void DisplaySWWidget::paintEvent(QPaintEvent *event)
+{
+    QLabel::paintEvent(event);
+    handlePaint(event);
+
+    if (isTsEnabled == true) {
+        /* draw multi-touch points */
+        QPainter painter(this);
+        drawMtPoints(painter);
+    }
+}
+
 /* override */
 void DisplaySWWidget::resizeEvent(QResizeEvent *event)
 {
@@ -113,6 +120,7 @@ void DisplaySWWidget::mouseMoveEvent(QMouseEvent *event)
     }
 }
 
+/* override */
 void DisplaySWWidget::enterEvent(QEvent *event)
 {
     handleMouseEnter(event);
@@ -123,6 +131,7 @@ void DisplaySWWidget::enterEvent(QEvent *event)
     }
 }
 
+/* override */
 void DisplaySWWidget::leaveEvent(QEvent *event)
 {
     handleMouseLeave(event);

diff --git a/tizen/src/ui/displayswwidget.h b/tizen/src/ui/displayswwidget.h
index 26de5d9b009dc7e6ff331e14a71b7e62386b5fec..2e753e26437b6a1779ea5ddb12b02d85d99e208d 100644 (file)
--- a/tizen/src/ui/displayswwidget.h
+++ b/tizen/src/ui/displayswwidget.h
@@ -58,7 +58,7 @@ protected:
     void leaveEvent(QEvent *event);
 
 private:
-    MultiTouchTracker *mtTracker;
+    void drawMtPoints(QPainter &painter);
 };
 
 #endif // DISPLAYSWWIDGET_H