screenshot: remove icon on Mac

On mac screenshot icon overwrite emulator icon.
So remove icon setting routine.

Signed-off-by: munkyu.im <munkyu.im@samsung.com>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java
index 6ca679c9f50ae66d35c4fbc627178f3abd4fbf01..b7ebb4106caa73fe1671e30bcdf11bf7fd99fc32 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorFingers.java
@@ -399,20 +399,16 @@ public class EmulatorFingers {
            rotatedPointY = pointY = (int)(finger.y * scaleFactor);
 //         logger.info("rotatedPointX:"+rotatedPointX+" rotatedPointY:"+rotatedPointY);
            if (rotationType == RotationInfo.LANDSCAPE.id()) {
-               logger.info("LANDSCAPE");
                rotatedPointX = pointY;
                rotatedPointY = ScaledLcdWitdh - pointX;
            } else if (rotationType == RotationInfo.REVERSE_PORTRAIT.id()) {
-               logger.info("REVERSE_PORTRAIT");
                rotatedPointX = ScaledLcdWitdh - pointX;
                rotatedPointY = ScaledLcdHeight - pointY;
            } else if (rotationType == RotationInfo.REVERSE_LANDSCAPE.id()) {
-               logger.info("REVERSE_LANDSCAPE");
                rotatedPointX = ScaledLcdHeight - pointY;
                rotatedPointY = pointX;
            } else {
-               logger.info("PORTRAITE");
-               
+             //PORTRAIT: do nothing    
            }
                
 

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index 1aa4ac2a1eb369c3eacf85a45597b19472fc23b1..29d59714936ceeb8a71e1d552bf93a3801c88025 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -604,13 +604,11 @@ public class EmulatorSkin {
                                        if (SwtUtil.isMacPlatform()) {
                                                //eventType = MouseEventType.DRAG.value();
                                                if (finger.getMultiTouchEnable() == 1) {
-                                                       logger.info("maruFingerProcessing1");
                                                        finger.maruFingerProcessing1(eventType,
                                                                        e.x, e.y, geometry[0], geometry[1]);
                                                        return;
                                                }
                                                else if (finger.getMultiTouchEnable() == 2) {
-                                                       logger.info("maruFingerProcessing2");
                                                        finger.maruFingerProcessing2(eventType,
                                                                        e.x, e.y, geometry[0], geometry[1]);
                                                        return;

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java
index 9096420d1e679f36955d434a668dff74bacff27e..9eee389d37ff5fe6dc491bc21b1ed86b50f6961a 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/ScreenShotDialog.java
@@ -128,10 +128,11 @@ public class ScreenShotDialog {
 
                shell = new Shell(Display.getDefault(), SWT.DIALOG_TRIM | SWT.RESIZE | SWT.MAX);
                shell.setText("Screen Shot - " + SkinUtil.makeEmulatorName(config));
-               if (icon != null) {
-                       shell.setImage(icon);
-               }
-
+        if(!SwtUtil.isMacPlatform()) {
+            if (icon != null) {
+                           shell.setImage(icon);
+                   }
+        }
                shell.addListener( SWT.Close, new Listener() {
                        @Override
                        public void handleEvent( Event event ) {