diff options
| author | jihye <jihye424.kim@samsung.com> | 2016-12-02 18:40:26 +0900 |
|---|---|---|
| committer | jihye <jihye424.kim@samsung.com> | 2016-12-02 18:49:14 +0900 |
| commit | 35ce03ee96a8b76cf5f8774f86eb5a2985fbd05d (patch) | |
| tree | 4359de82c0b9d849c71b9b35462271e4f2463c4e | |
| parent | 3a9fc4f0bb3fd67e82cfccedfc396b5dbc749627 (diff) | |
| download | qemu-35ce03ee96a8b76cf5f8774f86eb5a2985fbd05d.tar.gz qemu-35ce03ee96a8b76cf5f8774f86eb5a2985fbd05d.tar.bz2 qemu-35ce03ee96a8b76cf5f8774f86eb5a2985fbd05d.zip | |
skin: clear mask before set mask
Change-Id: Iea61ab5813fb52c7062e28cc706a0b381f2efb2e
Signed-off-by: jihye <jihye424.kim@samsung.com>
| -rw-r--r-- | tizen/src/ui/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | tizen/src/ui/uiinformation.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp index 52166086c3..06a8749cbd 100644 --- 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 ®ion) { + + 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 ee5a5c2738..51ad1690a9 100644 --- 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( |