From a22186d5e43986a0729b06eddd2329b6fbc90e5e Mon Sep 17 00:00:00 2001 From: fgnm Date: Sat, 11 Jul 2020 15:34:03 +0200 Subject: [PATCH] Bug fix --- assets/plugins/plugin-skin-composer-0.0.1.jar | Bin 10634 -> 10642 bytes .../skincomposer/SkinComposerMediator.java | 1 + .../view/ui/box/UILivePreviewBoxMediator.java | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/plugins/plugin-skin-composer-0.0.1.jar b/assets/plugins/plugin-skin-composer-0.0.1.jar index aa1f00e4518e7d6a11e756356a7dc5d359ef28be..b4a00f45892e694005cf274f6474d745a8597145 100644 GIT binary patch delta 3905 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 PcattDRtD-M000008<(go delta 3927 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 diff --git a/plugin-skin-composer/src/main/java/games/rednblack/editor/plugin/skincomposer/SkinComposerMediator.java b/plugin-skin-composer/src/main/java/games/rednblack/editor/plugin/skincomposer/SkinComposerMediator.java index 9ccf3bb7..b183dd1f 100644 --- a/plugin-skin-composer/src/main/java/games/rednblack/editor/plugin/skincomposer/SkinComposerMediator.java +++ b/plugin-skin-composer/src/main/java/games/rednblack/editor/plugin/skincomposer/SkinComposerMediator.java @@ -116,6 +116,7 @@ public class SkinComposerMediator extends SimpleMediator { try { Runtime.getRuntime().exec(" java -jar " + jarPath); } catch (IOException e) { + viewComponent.progressFailed(); e.printStackTrace(); } } diff --git a/src/main/java/games/rednblack/editor/view/ui/box/UILivePreviewBoxMediator.java b/src/main/java/games/rednblack/editor/view/ui/box/UILivePreviewBoxMediator.java index baf116ed..db6ba19d 100644 --- a/src/main/java/games/rednblack/editor/view/ui/box/UILivePreviewBoxMediator.java +++ b/src/main/java/games/rednblack/editor/view/ui/box/UILivePreviewBoxMediator.java @@ -74,8 +74,8 @@ public class UILivePreviewBoxMediator extends SimpleMediator { } private void createPreviewWindow() { - int previewWidth = resolutionManager.getCurrentResolution().width; - int previewHeight = resolutionManager.getCurrentResolution().height; + int previewWidth = resolutionManager.getOriginalResolution().width; + int previewHeight = resolutionManager.getOriginalResolution().height; Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration(); config.setWindowedMode(previewWidth, previewHeight);