Skip to content

Commit 229d64e

Browse files
committed
- fix show assets folder
- fix run project when the folder name has white spaces
1 parent cbacc3a commit 229d64e

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

adventure-composer/src/main/java/com/bladecoder/engineeditor/ui/ProjectToolbar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ private void openProjectFolder() {
261261
try {
262262
Desktop.getDesktop().open(
263263
new File(Ctx.project.getProjectDir().getAbsoluteFile()
264-
+ "/assets"));
264+
+ Project.ASSETS_PATH));
265265
} catch (IOException e1) {
266266
String msg = "Something went wrong while opening assets folder.\n\n"
267267
+ e1.getClass().getSimpleName()

adventure-composer/src/main/java/com/bladecoder/engineeditor/utils/RunProccess.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,14 @@ public static Process runJavaProccess(String mainClass, List<String> classpathEn
139139
public static boolean runGradle(File workingDir, String parameters) {
140140
String exec = workingDir.getAbsolutePath() + "/"
141141
+ (System.getProperty("os.name").contains("Windows") ? "gradlew.bat" : "gradlew");
142-
String command = exec + " " + parameters;
142+
String command = "exec" + " " + parameters;
143+
String[] split = command.split(" ");
144+
split[0] = exec;
143145

144146
EditorLogger.debug("Executing '" + command + "'");
145147

146148
try {
147-
final ProcessBuilder pb = new ProcessBuilder(command.split(" ")).directory(workingDir).redirectErrorStream(
149+
final ProcessBuilder pb = new ProcessBuilder(split).directory(workingDir).redirectErrorStream(
148150
true);
149151
;
150152

blade-engine/src/com/bladecoder/engine/ui/BladeSkin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public BitmapFont read(Json json, JsonValue jsonData, @SuppressWarnings("rawtype
8484
if (scaledSize != -1)
8585
font.setScale(scaledSize / font.getCapHeight());
8686
else if(size != -1) // TODO set size in points (dpi independent)
87-
font.setScale(DPIUtils.ptToPixels(size) / font.getCapHeight());
87+
font.setScale((DPIUtils.dpToPixels(size) * DPIUtils.getSizeMultiplier()) / font.getCapHeight());
8888
} catch (RuntimeException ex) {
8989
throw new SerializationException("Error loading bitmap font: " + fontFile, ex);
9090
}

0 commit comments

Comments
 (0)