Fix Java 9 requirement

This commit is contained in:
huanghongxun 2018-11-25 23:42:48 +08:00
parent 0f2922dab4
commit 2b792e73c9
3 changed files with 6 additions and 4 deletions

View File

@ -111,13 +111,15 @@ def createExecutable(String suffix, String header) {
} }
processResources { processResources {
ext.convertToBSS = { resource -> ext.convertToBSS = { String resource ->
exclude resource exclude resource
doFirst { doFirst {
def cssFile = new File(this.projectDir, "src/main/resources/" + resource) def cssFile = new File(this.projectDir, "src/main/resources/" + resource)
def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss") def bssFile = new File(this.projectDir, "build/compiled-resources/" + resource[0..-4] + "bss")
bssFile.parentFile.mkdirs() bssFile.parentFile.mkdirs()
javafx.css.Stylesheet.convertToBinary cssFile, bssFile exec {
commandLine 'javapackager', '-createbss', '-outdir', bssFile.parent, '-srcfiles', cssFile.path
}
} }
} }
from "build/compiled-resources" from "build/compiled-resources"

View File

@ -84,7 +84,7 @@ public class Theme {
.replace("%base-color%", color) .replace("%base-color%", color)
.replace("%font-color%", getColorDisplayName(getForegroundColor()))); .replace("%font-color%", getColorDisplayName(getForegroundColor())));
css = temp.toURI().toString(); css = temp.toURI().toString();
} catch (IOException e) { } catch (IOException | NullPointerException e) {
Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e); Logging.LOG.log(Level.SEVERE, "Unable to create theme stylesheet. Fallback to blue theme.", e);
css = "/assets/css/blue.css"; css = "/assets/css/blue.css";
} }

View File

@ -1240,7 +1240,7 @@
} }
.tree-table-row-cell .jfx-text-field { .tree-table-row-cell .jfx-text-field {
-fx-focus-color: rgba(82, 100, 174); -fx-focus-color: rgb(82, 100, 174);
} }
.tree-table-row-cell .jfx-text-field:error { .tree-table-row-cell .jfx-text-field:error {