On mac screenshot icon overwrite emulator icon.
So remove icon setting routine.
Signed-off-by: munkyu.im <munkyu.im@samsung.com>
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
}
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;
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 ) {