skin: Convert a HW key container in general skin

The container of HW keys is converted from Decorations
to Composite. Because Decorations control has different
behavior on between Windows and Linux.

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

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 7d18471211b79ebc408c93a5b429fa0ca98744da..cce2dad5afed288e03eec2611afdfb55676500f3 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
@@ -1436,77 +1436,75 @@ public class EmulatorSkin {
                //TODO:
        }
 
-       private void addMenuItems( final Shell shell, final Menu menu ) {
+       private void addMenuItems(final Shell shell, final Menu menu) {
 
                /* Emulator detail info menu */
-               final MenuItem detailInfoItem = new MenuItem( menu, SWT.PUSH );
+               final MenuItem detailInfoItem = new MenuItem(menu, SWT.PUSH);
 
-               String emulatorName = SkinUtil.makeEmulatorName( config );
-               detailInfoItem.setText( emulatorName );
-               detailInfoItem.setImage( imageRegistry.getIcon( IconName.DETAIL_INFO ) );
-               detailInfoItem.addSelectionListener( new SelectionAdapter() {
+               String emulatorName = SkinUtil.makeEmulatorName(config);
+               detailInfoItem.setText(emulatorName);
+               detailInfoItem.setImage(imageRegistry.getIcon(IconName.DETAIL_INFO));
+               detailInfoItem.addSelectionListener(new SelectionAdapter() {
                        @Override
-                       public void widgetSelected( SelectionEvent e ) {
-                               if ( logger.isLoggable( Level.FINE ) ) {
-                                       logger.fine( "Open detail info" );
+                       public void widgetSelected(SelectionEvent e) {
+                               if (logger.isLoggable(Level.FINE)) {
+                                       logger.fine("Open detail info");
                                }
-                               String emulatorName = SkinUtil.makeEmulatorName( config );
-                               DetailInfoDialog detailInfoDialog = new DetailInfoDialog( shell, emulatorName, communicator, config );
+
+                               String emulatorName = SkinUtil.makeEmulatorName(config);
+                               DetailInfoDialog detailInfoDialog = new DetailInfoDialog(
+                                               shell, emulatorName, communicator, config);
                                detailInfoDialog.open();
                        }
                } );
 
-               new MenuItem( menu, SWT.SEPARATOR );
+               new MenuItem(menu, SWT.SEPARATOR);
 
                /* Always on top menu */
-               if (!SwtUtil.isMacPlatform()) { /* temp */
-
-               final MenuItem onTopItem = new MenuItem( menu, SWT.CHECK );
-               onTopItem.setText( "&Always On Top" );
-               onTopItem.setSelection( isOnTop );
-
-               onTopItem.addSelectionListener( new SelectionAdapter() {
-                       @Override
-                       public void widgetSelected( SelectionEvent e ) {
+               if (!SwtUtil.isMacPlatform()) { /* not supported on mac */
+                       final MenuItem onTopItem = new MenuItem(menu, SWT.CHECK);
+                       onTopItem.setText("&Always On Top");
+                       onTopItem.setSelection(isOnTop);
 
-                               final boolean isOnTop = onTopItem.getSelection();
+                       onTopItem.addSelectionListener(new SelectionAdapter() {
+                               @Override
+                               public void widgetSelected(SelectionEvent e) {
+                                       final boolean isOnTop = onTopItem.getSelection();
 
-                               logger.info( "Select Always On Top : " + isOnTop );
+                                       logger.info("Select Always On Top : " + isOnTop);
+                                       // readyToReopen( EmulatorSkin.this, isOnTop );
 
-                               // readyToReopen( EmulatorSkin.this, isOnTop );
+                                       /* internal/Library.java::arch() */
+                                       String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
+                                       logger.info(osArch);
+                                       if (osArch.equals("amd64") || osArch.equals("x86_64") ||
+                                                       osArch.equals("IA64W") || osArch.equals("ia64")) {
+                                               //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
+                                               logger.info("64bit architecture");
 
-                               /* internal/Library.java::arch() */
-                               String osArch = System.getProperty("os.arch"); //$NON-NLS-1$
-                               logger.info(osArch);
-                               if (osArch.equals("amd64") || osArch.equals("x86_64") ||
-                                               osArch.equals("IA64W") || osArch.equals("ia64")) {
-                                       //$NON-NLS-1$ $NON-NLS-2$ $NON-NLS-3$
-                                       logger.info("64bit architecture");
+                                               setTopMost64(isOnTop); /* 64bit */
+                                       } else {
+                                               logger.info("32bit architecture");
 
-                                       setTopMost64(isOnTop); /* 64bit */
-                               } else {
-                                       logger.info("32bit architecture");
-
-                                       setTopMost32(isOnTop);
+                                               setTopMost32(isOnTop);
+                                       }
                                }
-                       }
-               } );
-
+                       } );
                }
 
                /* Rotate menu */
-               final MenuItem rotateItem = new MenuItem( menu, SWT.CASCADE );
-               rotateItem.setText( "&Rotate" );
-               rotateItem.setImage( imageRegistry.getIcon( IconName.ROTATE ) );
-               Menu rotateMenu = createRotateMenu( menu.getShell() );
-               rotateItem.setMenu( rotateMenu );
+               final MenuItem rotateItem = new MenuItem(menu, SWT.CASCADE);
+               rotateItem.setText("&Rotate");
+               rotateItem.setImage(imageRegistry.getIcon(IconName.ROTATE));
+               Menu rotateMenu = createRotateMenu(menu.getShell());
+               rotateItem.setMenu(rotateMenu);
 
                /* Scale menu */
-               final MenuItem scaleItem = new MenuItem( menu, SWT.CASCADE );
-               scaleItem.setText( "&Scale" );
-               scaleItem.setImage( imageRegistry.getIcon( IconName.SCALE ) );
-               Menu scaleMenu = createScaleMenu( menu.getShell() );
-               scaleItem.setMenu( scaleMenu );
+               final MenuItem scaleItem = new MenuItem(menu, SWT.CASCADE);
+               scaleItem.setText("&Scale");
+               scaleItem.setImage(imageRegistry.getIcon(IconName.SCALE));
+               Menu scaleMenu = createScaleMenu(menu.getShell());
+               scaleItem.setMenu(scaleMenu);
 
                new MenuItem(menu, SWT.SEPARATOR);
 

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
index ff7cbf78153f5a26936e11e375413dd4e921a863..41aee39d9466e8316afecea244b478b4200059f7 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/GeneralPurposeSkinComposer.java
@@ -42,6 +42,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Decorations;
 import org.eclipse.swt.widgets.Shell;
 import org.tizen.emulator.skin.EmulatorSkinState;
@@ -54,7 +55,6 @@ import org.tizen.emulator.skin.config.EmulatorConfig;
 import org.tizen.emulator.skin.config.EmulatorConfig.ArgsConstants;
 import org.tizen.emulator.skin.config.EmulatorConfig.SkinPropertiesConstants;
 import org.tizen.emulator.skin.dbi.KeyMapType;
-import org.tizen.emulator.skin.dbi.RotationType;
 import org.tizen.emulator.skin.image.ImageRegistry;
 import org.tizen.emulator.skin.image.ImageRegistry.IconName;
 import org.tizen.emulator.skin.log.SkinLogger;
@@ -69,7 +69,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
        private EmulatorConfig config;
        private Shell shell;
        private Canvas lcdCanvas;
-       private Decorations decoration;
+       private Composite compositeBase;
        private EmulatorSkinState currentState;
 
        private ImageRegistry imageRegistry;
@@ -80,7 +80,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
                        SocketCommunicator communicator) {
                this.config = config;
                this.shell = shell;
-               this.decoration = null;
+               this.compositeBase = null;
                this.currentState = currentState;
                this.imageRegistry = imageRegistry;
                this.communicator = communicator;
@@ -161,9 +161,9 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
                dataCanvas.height = lcdBounds.height;
                lcdCanvas.setLayoutData(dataCanvas);
 
-               if (decoration != null) {
-                       decoration.dispose();
-                       decoration = null;
+               if (compositeBase != null) {
+                       compositeBase.dispose();
+                       compositeBase = null;
                }
 
                shell.pack();
@@ -172,11 +172,11 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
                                SkinUtil.getHWKeyMapList(currentState.getCurrentRotationId());
 
                if (keyMapList != null && keyMapList.isEmpty() == false) {
-                       decoration = new Decorations(shell, SWT.BORDER);
-                       decoration.setLayout(new GridLayout(1, true));
+                       compositeBase = new Decorations(shell, SWT.NONE);
+                       compositeBase.setLayout(new GridLayout(1, true));
 
                        for (KeyMapType keyEntry : keyMapList) {
-                               Button hardKeyButton = new Button(decoration, SWT.FLAT);
+                               Button hardKeyButton = new Button(compositeBase, SWT.FLAT);
                                hardKeyButton.setText(keyEntry.getEventInfo().getKeyName());
                                hardKeyButton.setToolTipText(keyEntry.getTooltip());
 
@@ -208,7 +208,7 @@ public class GeneralPurposeSkinComposer implements ISkinComposer {
                        FormData dataDecoration = new FormData();
                        dataDecoration.left = new FormAttachment(lcdCanvas, 0);
                        dataDecoration.top = new FormAttachment(0, 0);
-                       decoration.setLayoutData(dataDecoration);
+                       compositeBase.setLayoutData(dataDecoration);
                }
 
                shell.pack();

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/ControlPanel.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/window/ControlPanel.java
index f2bf61b3411eb7a8d3a0f3f6fae8c17683dfdee6..8f62d9112018c983f2f8dfae34c0a686f5f2f4ce 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/window/ControlPanel.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/window/ControlPanel.java
@@ -67,7 +67,7 @@ public class ControlPanel extends SkinWindow {
                createContents();
                addControlPanelListener();
 
-               //shell.setSize(160, 100);
+               shell.setSize(160, 100);
        }
 
        protected void createContents() {