diff options
| author | Park Kyoung Won <kw0712.park@samsung.com> | 2017-08-31 17:35:40 +0900 |
|---|---|---|
| committer | 황석연/L4/프로/개발플랫폼팀/에스코어 <syeon-hwang@users.noreply.github.sec.samsung.net> | 2017-08-31 17:41:15 +0900 |
| commit | 775a60b3466755ec6953e1d03c49cac9542b22d5 (patch) | |
| tree | cd70b39f4fb8e04c5585fb9ab6aa2167eeb522ca | |
| parent | ffec7d6785f51f4847534d26095d9dfbf4f74fc9 (diff) | |
| download | emulator-control-panel-775a60b3466755ec6953e1d03c49cac9542b22d5.tar.gz emulator-control-panel-775a60b3466755ec6953e1d03c49cac9542b22d5.tar.bz2 emulator-control-panel-775a60b3466755ec6953e1d03c49cac9542b22d5.zip | |
svace: fix bug
- casting double to int while calculating the number of columns
Signed-off-by: Park Kyoung Won <kw0712.park@samsung.com>
| -rw-r--r-- | ECP-UI/src/org/tizen/ecp/EmulatorControlPanel.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/ECP-UI/src/org/tizen/ecp/EmulatorControlPanel.java b/ECP-UI/src/org/tizen/ecp/EmulatorControlPanel.java index bc565a9a..8e169708 100644 --- a/ECP-UI/src/org/tizen/ecp/EmulatorControlPanel.java +++ b/ECP-UI/src/org/tizen/ecp/EmulatorControlPanel.java @@ -244,8 +244,9 @@ public class EmulatorControlPanel extends Application { @Override public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) { theNumberOfCardCols = Math.min(theNumberOfCards, newValue.intValue() / ECPConstants.TILE_WIDTH); - if (isMinSize == false) + if (isMinSize == false) { minSizer.play(); + } } }); @@ -256,8 +257,9 @@ public class EmulatorControlPanel extends Application { public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) { heightBackup = newValue.intValue(); - if (isMinSize == false) + if (isMinSize == false) { minSizer.play(); + } } }); } @@ -283,17 +285,16 @@ public class EmulatorControlPanel extends Application { @Override public void run() { - theHeightOfDialog = (mainStage.getHeight() - scene.getHeight()); - stage.setWidth(((theNumberOfCardCols < ECPConstants.THE_MINIMUM_NUMBER_OF_COLUMNS) + theHeightOfDialog = mainStage.getHeight() - scene.getHeight(); + stage.setWidth((theNumberOfCardCols < ECPConstants.THE_MINIMUM_NUMBER_OF_COLUMNS ? ECPConstants.THE_MINIMUM_NUMBER_OF_COLUMNS : theNumberOfCardCols) * ECPConstants.TILE_WIDTH + (mainStage.getWidth() - scene.getWidth())); if (heightBackup != 0) { - resizeSceneHeight((double) (heightBackup - ECPConstants.HEIGHT_EXCEPT_TILES) - / ECPConstants.TILE_HEIGHT); + resizeSceneHeight((heightBackup - ECPConstants.HEIGHT_EXCEPT_TILES) / ECPConstants.TILE_HEIGHT); heightBackup = 0; } else { - resizeSceneHeight((EmulatorControlPanel.getMainStage().getHeight() + resizeSceneHeight((int)(EmulatorControlPanel.getMainStage().getHeight() - ECPConstants.HEIGHT_EXCEPT_TILES - theHeightOfDialog) / ECPConstants.TILE_HEIGHT); } @@ -315,16 +316,17 @@ public class EmulatorControlPanel extends Application { } - public void resizeSceneHeight(double sizeOfTiles) { + public void resizeSceneHeight(int sizeOfTiles) { int maxOfTiles; - if (theNumberOfCardCols != 0) - maxOfTiles = (theNumberOfCards / theNumberOfCardCols) - + (((theNumberOfCards % theNumberOfCardCols) != 0) ? 1 : 0); - else + if (theNumberOfCardCols != 0) { + maxOfTiles = theNumberOfCards / theNumberOfCardCols + + (theNumberOfCards % theNumberOfCardCols != 0 ? 1 : 0); + } else { maxOfTiles = theNumberOfCards; + } EmulatorControlPanel.getMainStage() - .setHeight(((sizeOfTiles > maxOfTiles) ? maxOfTiles : sizeOfTiles) * ECPConstants.TILE_HEIGHT + .setHeight((sizeOfTiles > maxOfTiles ? maxOfTiles : sizeOfTiles) * ECPConstants.TILE_HEIGHT + ECPConstants.HEIGHT_EXCEPT_TILES + theHeightOfDialog); } |