Skip to content
Snippets Groups Projects
Commit 2d0a662a authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#157 - fixed css generation

parent a7c6d552
No related branches found
No related tags found
No related merge requests found
.pad${#prefix}-cue-in {
-fx-background-color: ${#padCueInColor} !important;
}
\ No newline at end of file
...@@ -21,11 +21,6 @@ ...@@ -21,11 +21,6 @@
-fx-background-color: ${#padColor}; -fx-background-color: ${#padColor};
} }
.pad${#prefix}-cue-in${#class} {
-fx-background-color: ${#padCueInColor};
}
.pad${#prefix}-info${#class} { .pad${#prefix}-info${#class} {
-fx-text-fill: ${#fontColor}; -fx-text-fill: ${#fontColor};
} }
......
...@@ -19,25 +19,24 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler { ...@@ -19,25 +19,24 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler {
if(design.isEnableCustomBackgroundColor) if(design.isEnableCustomBackgroundColor)
{ {
result += generateCss(design, flat, classSuffix, design.getBackgroundColor) result += generatePadCss(design, flat, classSuffix, design.getBackgroundColor)
generateCss(design, flat, classSuffix, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}") result += generatePadCss(design, flat, classSuffix, design.getBackgroundColor, s":${PseudoClasses.WARN_CLASS.getPseudoClassName}")
} }
if(design.isEnableCustomPlayColor) if(design.isEnableCustomPlayColor)
{ {
result += generateCss(design, flat, classSuffix, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}") result += generatePadCss(design, flat, classSuffix, design.getPlayColor, s":${PseudoClasses.PLAY_CLASS.getPseudoClassName}")
} }
result if(design.isEnableCustomCueInColor)
{
result += generateCueInCss(design, flat, classSuffix)
} }
private def generateCss(design: ModernCartDesign, flat: Boolean, padIdentifier: String, color: ModernColor, styleState: String = ""): String = { result
val expressionParser: ExpressionParser = new SpelExpressionParser() }
val context = new StandardEvaluationContext()
val resource = ApplicationUtils.getApplication.getClasspathResource("style/modern-pad.css")
val string = Minifier minify resource.getAsString
private def generatePadCss(design: ModernCartDesign, flat: Boolean, padIdentifier: String, color: ModernColor, styleState: String = ""): String = {
val values: Map[String, AnyRef] = Map( val values: Map[String, AnyRef] = Map(
"prefix" -> padIdentifier, "prefix" -> padIdentifier,
"class" -> styleState, "class" -> styleState,
...@@ -49,7 +48,27 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler { ...@@ -49,7 +48,27 @@ class ModernCartDesignHandlerImpl extends ModernCartDesignHandler {
"fontColor" -> color.getFontColor "fontColor" -> color.getFontColor
) )
generateCss("style/modern-pad.css", values)
}
private def generateCueInCss(design: ModernCartDesign, flat: Boolean, padIdentifier: String): String = {
val values: Map[String, AnyRef] = Map(
"prefix" -> padIdentifier,
"padCueInColor" -> (if (flat) design.getCueInColor.paint() else design.getCueInColor.linearGradient())
)
generateCss("style/modern-pad-cue-in.css", values)
}
private def generateCss(templatePath: String, values: Map[String, AnyRef]): String =
{
val expressionParser: ExpressionParser = new SpelExpressionParser()
val context = new StandardEvaluationContext()
val resource = ApplicationUtils.getApplication.getClasspathResource(templatePath)
val content = Minifier minify resource.getAsString
context.setVariables(values.asJava) context.setVariables(values.asJava)
expressionParser.parseExpression(string, new TemplateParserContext("${", "}")).getValue(context, classOf[String]) expressionParser.parseExpression(content, new TemplateParserContext("${", "}")).getValue(context, classOf[String])
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment