Fixes Open-Systems-Pharmacology#252 by default labels are centered

pchelle · May 4, 2022 · 9b05816 · 9b05816
1 parent 2cbd8ad
commit 9b05816
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 27 deletions.
diff --git a/R/font.R b/R/font.R
@@ -15,7 +15,7 @@ Font <- R6::R6Class(
     fontFamily = "",
     fontFace = "plain",
     angle = 0,
-    align = "left",
+    align = "center",
 
     #' @description Create a new `Font` object.
     #' Default font properties are defined directly in the object field,

diff --git a/R/themes.R b/R/themes.R
@@ -56,7 +56,7 @@ ThemeFont <- R6::R6Class(
                           baseFace = "plain",
                           baseFamily = "",
                           baseAngle = 0,
-                          baseAlign = "left") {
+                          baseAlign = "center") {
       # Validate necessary input
       validateIsString(baseColor)
       validateIsString(baseFamily)

diff --git a/inst/themes/dark-theme.json b/inst/themes/dark-theme.json
@@ -5,14 +5,16 @@
       "size": 14,
       "fontFace": "bold",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "subtitle": {
       "color": "#BDBDBD",
       "size": 11,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "xlabel": {
       "color": "#BDBDBD",
@@ -35,14 +37,24 @@
       "size": 18,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 30
+      "angle": 30,
+      "align": "center"
     },
     "legend": {
       "color": "#BDBDBD",
       "size": 10,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "left"
+    },
+    "legendTitle": {
+      "color": "black",
+      "size": 14,
+      "fontFace": "plain",
+      "fontFamily": "",
+      "angle": 0,
+      "align": "center"
     },
     "xAxis": {
       "color": "#BDBDBD",

diff --git a/inst/themes/excel-theme.json b/inst/themes/excel-theme.json
@@ -5,14 +5,16 @@
       "size": 12,
       "fontFace": "bold",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "subtitle": {
       "color": "#595959",
       "size": 12,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "xlabel": {
       "color": "#595959",
@@ -35,14 +37,24 @@
       "size": 40,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 30
+      "angle": 30,
+      "align": "center"
     },
     "legend": {
       "color": "#595959",
       "size": 9,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "left"
+    },
+    "legendTitle": {
+      "color": "black",
+      "size": 9,
+      "fontFace": "plain",
+      "fontFamily": "",
+      "angle": 0,
+      "align": "center"
     },
     "xAxis": {
       "color": "#595959",

diff --git a/inst/themes/hc-theme.json b/inst/themes/hc-theme.json
@@ -5,14 +5,16 @@
       "size": 12,
       "fontFace": "bold",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "subtitle": {
       "color": "#707073",
       "size": 12,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "xlabel": {
       "color": "#707073",
@@ -35,14 +37,24 @@
       "size": 40,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 30
+      "angle": 30,
+      "align": "center"
     },
     "legend": {
       "color": "#707073",
       "size": 10,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "left"
+    },
+    "legendTitle": {
+      "color": "black",
+      "size": 14,
+      "fontFace": "plain",
+      "fontFamily": "",
+      "angle": 0,
+      "align": "center"
     },
     "xAxis": {
       "color": "#707073",

diff --git a/inst/themes/matlab-theme.json b/inst/themes/matlab-theme.json
@@ -5,14 +5,16 @@
       "size": 12,
       "fontFace": "bold",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "subtitle": {
       "color": "black",
       "size": 11,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "xlabel": {
       "color": "black",
@@ -42,7 +44,16 @@
       "size": 8,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "left"
+    },
+    "legendTitle": {
+      "color": "black",
+      "size": 14,
+      "fontFace": "plain",
+      "fontFamily": "",
+      "angle": 0,
+      "align": "center"
     },
     "xAxis": {
       "color": "black",

diff --git a/inst/themes/minimal-theme.json b/inst/themes/minimal-theme.json
@@ -5,14 +5,16 @@
       "size": 12,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "subtitle": {
       "color": "grey20",
       "size": 10,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "xlabel": {
       "color": "grey20",
@@ -35,14 +37,24 @@
       "size": 12,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 30
+      "angle": 30,
+      "align": "center"
     },
     "legend": {
       "color": "grey20",
       "size": 10,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "left"
+    },
+    "legendTitle": {
+      "color": "black",
+      "size": 14,
+      "fontFace": "plain",
+      "fontFamily": "",
+      "angle": 0,
+      "align": "center"
     },
     "xAxis": {
       "color": "grey20",

diff --git a/inst/themes/template-theme.json b/inst/themes/template-theme.json
@@ -5,14 +5,16 @@
       "size": 16,
       "fontFace": "bold",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "subtitle": {
       "color": "black",
       "size": 12,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "xlabel": {
       "color": "black",
@@ -35,21 +37,24 @@
       "size": 12,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 30
+      "angle": 30,
+      "align": "center"
     },
     "legend": {
       "color": "black",
       "size": 14,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "left"
     },
     "legendTitle": {
       "color": "black",
       "size": 14,
       "fontFace": "plain",
       "fontFamily": "",
-      "angle": 0
+      "angle": 0,
+      "align": "center"
     },
     "xAxis": {
       "color": "black",

diff --git a/man/ThemeFont.Rd b/man/ThemeFont.Rd