update theme

YuLab-SMU · Dec 25, 2019 · 0b7e8bb · 0b7e8bb
1 parent d030db3
commit 0b7e8bb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -9,6 +9,7 @@ Imports:
 	graphics,
   magrittr,
   rlang,
+  methods,
   utils
 Suggests:
   stats,

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,6 +1,7 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method("+",bbplot)
+S3method("<=",bb_theme)
 S3method(bbplot_add,bb_labs)
 S3method(bbplot_add,bb_layer)
 S3method(bbplot_add,bb_theme)
@@ -30,6 +31,7 @@ importFrom(graphics,points)
 importFrom(graphics,segments)
 importFrom(graphics,title)
 importFrom(magrittr,"%>%")
+importFrom(methods,is)
 importFrom(rlang,enquos)
 importFrom(rlang,quo_name)
 importFrom(utils,modifyList)
diff --git a/R/add-layer.R b/R/add-layer.R
@@ -30,4 +30,10 @@ add_layer <- function(plot, layer, layer_name) {
     return(plot)
 }
 
-
+##' @method <= bb_theme
+##' @importFrom methods is
+##' @export
+`<=.bb_theme` <- function(e1, e2) {
+    stopifnot(is(e2, "bb_theme"))
+    modifyList(e1, e2)
+}
diff --git a/R/theme.R b/R/theme.R
@@ -17,43 +17,42 @@ bb_theme <- function(...) {
 ##' @method bbplot_add bb_theme
 ##' @export
 bbplot_add.bb_theme <- function(object, plot) {
-    plot$theme <- modifyList(plot$theme, object)
+    plot$theme <- plot$theme <= object
     plot
 }
 
 
 ##' @rdname bb-theme
 ##' @export
 bb_theme_expand <- function(...) {
-    theme_default <- bb_theme(
+    bb_theme(
         mar=c(3,3,2,1),
         mgp=c(2,0.4,0),
         tck=-.01,
         cex.axis=.9
-    )
-    modifyList(theme_default, bb_theme(...))
+    )  <= bb_theme(...)
 }
 
 ##' @rdname bb-theme
 ##' @export
 bb_theme_grey <- function(...) {
-    theme_default <- bb_theme(
+    bb_theme(
         cex.axis = .9,
         bg = "grey85",
         fg = "grey20",
         col.axis = "grey20",
         col.lab = "grey20"
-        )
-    modifyList(theme_default, bb_theme(...))
+    )  <= bb_theme(...)
 }
 
 ##' @rdname bb-theme
 ##' @export
 bb_theme_deepblue <- function(...) {
-    theme_default <- bb_theme(
+    bb_theme(
         bg = "#002E49",
         fg = "#CCCCCC",
         col.axis = "#BEBEBE",
         col.lab = "#FFFFFF"
-    )
+    ) <= bb_theme(...)
 }
+