draw_key_draw: fix error for gList output

Yunuuuu · Nov 15, 2024 · 13826bb · 13826bb
1 parent 1d829dd
commit 13826bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/R/geom-draw.R b/R/geom-draw.R
@@ -41,18 +41,16 @@
 #'                 pointsGrob(x, y, pch = shape),
 #'                 # To ensure the rectangle color is shown in the legends, you
 #'                 # must explicitly provide a color argument and include it in
-# '                # the `gpar()` of the graphical object
+#'                 # the `gpar()` of the graphical object
 #'                 rectGrob(x, y, width, height,
 #'                     gp = gpar(col = "black", fill = NA)
 #'                 )
 #'             )
 #'         },
 #'         e = function(xmin, xmax, ymin, ymax) {
 #'             segmentsGrob(
-#'                 xmin,
-#'                 ymin,
-#'                 xmax,
-#'                 ymax,
+#'                 xmin, ymin,
+#'                 xmax, ymax,
 #'                 gp = gpar(lwd = 2)
 #'             )
 #'         }
@@ -115,10 +113,12 @@ draw_key_draw <- function(data, params, size) {
         }
     }
     if (any(args == "...")) {
-        inject(draw(!!!data))
+        ans <- inject(draw(!!!data))
     } else {
-        inject(draw(!!!.subset(data, args)))
+        ans <- inject(draw(!!!.subset(data, args)))
     }
+    if (inherits(ans, "gList")) ans <- grid::gTree(children = ans)
+    ans
 }
 
 combine_aes <- function(...) {

diff --git a/man/geom_draw.Rd b/man/geom_draw.Rd
diff --git a/man/scale_draw_manual.Rd b/man/scale_draw_manual.Rd