screenshot: add screenshot masking

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

diff --git a/tizen/src/display/xmllayoutparser.cpp b/tizen/src/display/xmllayoutparser.cpp
index 267fd49..542e228 100644 (file)
--- a/tizen/src/display/xmllayoutparser.cpp
+++ b/tizen/src/display/xmllayoutparser.cpp
@@ -139,7 +139,7 @@ DisplayType *XmlLayoutParser::parseDisplay(QXmlStreamReader &xml)
     int angle = 0;
     QPixmap maskImage;
 
-    qDebug("** display {");
+    qDebug() << "**" << DISPLAY_KEYWORD << "{";
 
     QXmlStreamReader::TokenType token = xml.readNext();
 

diff --git a/tizen/src/ui/menu/screenshotdialog.cpp b/tizen/src/ui/menu/screenshotdialog.cpp
index 8fad6d9..490dfd2 100644 (file)
--- a/tizen/src/ui/menu/screenshotdialog.cpp
+++ b/tizen/src/ui/menu/screenshotdialog.cpp
@@ -191,6 +191,12 @@ void ScreenShotDialog::slotRefresh(const QPixmap &pixmap)
 
     shotData = pixmap;
 
+    /* masking */
+    QPixmap maskImage = win->uiInfo->getMainFormDisplayType()->getMask();
+    if (maskImage.size() != QSize(0, 0)) {
+        shotData.setMask(maskImage.mask());
+    }
+
     scene->clear();
 
     /* draw a screenshot */