From 6aa8f6a75b0d79382905a0d3cd80defc48e6a6da Mon Sep 17 00:00:00 2001
From: ryoii <ryoii@foxmail.com>
Date: Sat, 21 Mar 2020 23:31:47 +0800
Subject: [PATCH] color

---
 .../graphical/styleSheet/BaseStyleSheet.kt    | 15 +++++++++++
 .../styleSheet/LoginViewStyleSheet.kt         | 12 ++++++---
 .../graphical/styleSheet/PrimaryStyleSheet.kt | 26 ++++++++++++++++---
 .../console/graphical/view/PrimaryView.kt     |  4 ++-
 4 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/BaseStyleSheet.kt

diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/BaseStyleSheet.kt b/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/BaseStyleSheet.kt
new file mode 100644
index 000000000..d7bb3cbca
--- /dev/null
+++ b/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/BaseStyleSheet.kt
@@ -0,0 +1,15 @@
+package net.mamoe.mirai.console.graphical.styleSheet
+
+import tornadofx.Stylesheet
+import tornadofx.c
+
+open class BaseStyleSheet : Stylesheet() {
+
+    companion object {
+        const val primaryColor = "0EA987"
+        const val stressColor = "35867C"
+        const val secondaryColor = "32CABA"
+        const val lightColor ="9FD1CC"
+        const val FontColor = "FFFFFF"
+    }
+}
\ No newline at end of file
diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/LoginViewStyleSheet.kt b/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/LoginViewStyleSheet.kt
index 6e0b1f69c..06fb8166b 100644
--- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/LoginViewStyleSheet.kt
+++ b/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/LoginViewStyleSheet.kt
@@ -7,7 +7,7 @@ import javafx.scene.paint.Color
 import javafx.scene.text.FontWeight
 import tornadofx.*
 
-class LoginViewStyleSheet : Stylesheet() {
+class LoginViewStyleSheet : BaseStyleSheet() {
 
     companion object {
         val vBox by csselement("VBox")
@@ -15,11 +15,14 @@ class LoginViewStyleSheet : Stylesheet() {
 
     init {
 
+        /*
+         * center box
+         */
         vBox {
             maxWidth = 500.px
             maxHeight = 500.px
 
-            backgroundColor += c("39c5BB", 0.3)
+            backgroundColor += c(primaryColor, 0.3)
             backgroundRadius += box(15.px)
 
             padding = box(50.px, 100.px)
@@ -35,8 +38,11 @@ class LoginViewStyleSheet : Stylesheet() {
             fontWeight = FontWeight.BOLD
         }
 
+        /*
+         * login button
+         */
         button {
-            backgroundColor += c("00BCD4", 0.8)
+            backgroundColor += c(stressColor, 0.8)
             padding = box(10.px, 0.px)
             prefWidth = 500.px
             textFill = Color.WHITE
diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/PrimaryStyleSheet.kt b/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/PrimaryStyleSheet.kt
index 8f47b7a39..593dad8d9 100644
--- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/PrimaryStyleSheet.kt
+++ b/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/styleSheet/PrimaryStyleSheet.kt
@@ -1,21 +1,39 @@
 package net.mamoe.mirai.console.graphical.styleSheet
 
-import tornadofx.*
+import tornadofx.box
+import tornadofx.c
+import tornadofx.cssclass
+import tornadofx.px
 
-class PrimaryStyleSheet : Stylesheet() {
+class PrimaryStyleSheet : BaseStyleSheet() {
     companion object {
+        // window
         val jfxTitle by cssclass("jfx-decorator-buttons-container")
         val container by cssclass("jfx-decorator-content-container")
+
+        // tab
+        val tabPane by cssclass("tab-header-background")
     }
 
     init {
+        /*
+         * window
+         */
         jfxTitle {
-            backgroundColor += c("00BCD4")
+            backgroundColor += c(primaryColor)
         }
 
         container {
-            borderColor += box(c("00BCD4"))
+            borderColor += box(c(primaryColor))
             borderWidth += box(0.px, 4.px, 4.px, 4.px)
         }
+
+
+        /*
+         * tab pane
+         */
+        tabPane {
+            backgroundColor += c(primaryColor)
+        }
     }
 }
\ No newline at end of file
diff --git a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt b/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt
index c858aea81..0f9601cec 100644
--- a/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt
+++ b/mirai-console-graphical/src/main/kotlin/net/mamoe/mirai/console/graphical/view/PrimaryView.kt
@@ -23,7 +23,9 @@ class PrimaryView : View() {
 
         left = vbox {
 
-            imageview(Image(PrimaryView::class.java.classLoader.getResourceAsStream("logo.png")))
+            imageview(Image(PrimaryView::class.java.classLoader.getResourceAsStream("logo.png"))) {
+                isPreserveRatio = true
+            }
 
             // bot list
             jfxListView(controller.botList) {