From 39659a62c345004a10f2cae4e49db9b3cb00d4d7 Mon Sep 17 00:00:00 2001 From: "munkyu.im" Date: Fri, 18 Jan 2013 15:56:03 +0900 Subject: [PATCH] screenshot: remove icon on Mac On mac screenshot icon overwrite emulator icon. So remove icon setting routine. Signed-off-by: munkyu.im --- .../src/org/tizen/emulator/skin/EmulatorFingers.java | 6 +----- .../client/src/org/tizen/emulator/skin/EmulatorSkin.java | 2 -- .../tizen/emulator/skin/screenshot/ScreenShotDialog.java | 9 +++++---- 3 files changed, 6 insertions(+), 11 deletions(-) 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 6ca679c9f5..b7ebb4106c 100644 --- 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 1aa4ac2a1e..29d5971493 100644 --- 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 9096420d1e..9eee389d37 100644 --- 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 ) { -- 2.34.1