From 01fcdede6ed2d947e84597ba246ef8d0abee0ac1 Mon Sep 17 00:00:00 2001 From: "giwoong.kim" Date: Mon, 4 Feb 2013 13:55:55 +0900 Subject: [PATCH] skin: call setSize after pack the shell call setSize after pack the shell Signed-off-by: GiWoong Kim --- .../skin/layout/GeneralPurposeSkinComposer.java | 13 +++++++++---- .../skin/layout/PhoneShapeSkinComposer.java | 14 ++++++++++---- 2 files changed, 19 insertions(+), 8 deletions(-) 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 a8ae267e55..2fbb281cd1 100644 --- 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 @@ -269,9 +269,6 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { displayBounds.y + displayBounds.height + 1, displayBounds.width, 2); } - /* custom window shape */ - trimPatchedShell(shell, currentState.getCurrentImage()); - /* arrange the pair tag */ skin.pairTagCanvas.setBounds( PAIR_TAG_POSITION_X, PAIR_TAG_POSITION_Y, @@ -281,10 +278,18 @@ public class GeneralPurposeSkinComposer implements ISkinComposer { if (currentState.getCurrentImage() != null) { ImageData imageData = currentState.getCurrentImage().getImageData(); shell.setMinimumSize(imageData.width, imageData.height); - shell.setSize(imageData.width, imageData.height); } shell.pack(); + + if (currentState.getCurrentImage() != null) { + ImageData imageData = currentState.getCurrentImage().getImageData(); + shell.setSize(imageData.width, imageData.height); + } + + /* custom window shape */ + trimPatchedShell(shell, currentState.getCurrentImage()); + shell.redraw(); } diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java index 64d3e966a7..7fd6b9ec33 100644 --- a/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java +++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/layout/PhoneShapeSkinComposer.java @@ -215,17 +215,23 @@ public class PhoneShapeSkinComposer implements ISkinComposer { lcdBounds.y + lcdBounds.height + 1, lcdBounds.width, 2); } - /* custom window shape */ - SkinUtil.trimShell(shell, currentState.getCurrentImage()); - /* set window size */ if (currentState.getCurrentImage() != null) { ImageData imageData = currentState.getCurrentImage().getImageData(); shell.setMinimumSize(imageData.width, imageData.height); - shell.setSize(imageData.width, imageData.height); } shell.pack(); + + /* set window size */ + if (currentState.getCurrentImage() != null) { + ImageData imageData = currentState.getCurrentImage().getImageData(); + shell.setSize(imageData.width, imageData.height); + } + + /* custom window shape */ + SkinUtil.trimShell(shell, currentState.getCurrentImage()); + shell.redraw(); } -- 2.34.1