skin: clear mask before set mask

Change-Id: Iea61ab5813fb52c7062e28cc706a0b381f2efb2e
Signed-off-by: jihye <jihye424.kim@samsung.com>

diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp
index 52166086c333ebb8c402672288badb03ef444c34..06a8749cbdcd9f0e5c4f0be548e5c2ad0889479b 100644 (file)
--- a/tizen/src/ui/mainwindow.cpp
+++ b/tizen/src/ui/mainwindow.cpp
@@ -347,11 +347,11 @@ void MainWindow::resizeEvent(QResizeEvent *event)
 /* override */
 void MainWindow::setMask(const QRegion &region)
 {
+
+    clearMask();
+
     if (region.isEmpty() == false) {
         QWidget::setMask(region);
-    } else if (mask().isEmpty() == false) {
-        qDebug("removes any mask set");
-        clearMask();
     }
 }
 

diff --git a/tizen/src/ui/uiinformation.cpp b/tizen/src/ui/uiinformation.cpp
index ee5a5c27380d82afb62a8c9388b2ea6188e8f058..51ad1690a91ddc0756130cdb6fa4d468fdec282a 100644 (file)
--- a/tizen/src/ui/uiinformation.cpp
+++ b/tizen/src/ui/uiinformation.cpp
@@ -234,6 +234,8 @@ QRegion UiInformation::getMainKeyRegion(
     QRegion baseRegion = base->mask().subtracted(QRect(
         keyRect.topLeft() * uiState.getScaleFactor(),
         keyRect.size() * uiState.getScaleFactor()));
+    // FIXME: clear key rectangle region
+    base->setMask(baseRegion);
 
     QImage keyImage = getMainForm()->skinImg[type].copy(keyRect);
     QImage regionImage = keyImage.scaled(