Skip to content

Commit 1159837

Browse files
authored
Set defaults in text based keys (#5587)
* set defaults in text based keys * set default key parameters
1 parent 9367b48 commit 1159837

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

R/legend-draw.R

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,10 @@ draw_key_smooth <- function(data, params, size) {
258258
#' @export
259259
#' @rdname draw_key
260260
draw_key_text <- function(data, params, size) {
261-
data$label <- data$label %||% "a"
261+
data <- replace_null(
262+
unclass(data),
263+
label = "a", hjust = 0.5, vjust = 0.5, angle = 0
264+
)
262265
just <- rotate_just(data$angle, data$hjust, data$vjust)
263266
grob <- titleGrob(
264267
data$label,
@@ -283,9 +286,13 @@ draw_key_text <- function(data, params, size) {
283286
#' @export
284287
#' @rdname draw_key
285288
draw_key_label <- function(data, params, size) {
286-
data$label <- data$label %||% "a"
289+
data <- replace_null(
290+
unclass(data),
291+
label = "a", hjust = 0.5, vjust = 0.5, angle = 0
292+
)
293+
params$label.size <- params$label.size %||% 0.25
287294
just <- rotate_just(data$angle, data$hjust, data$vjust)
288-
padding <- rep(params$label.padding, length.out = 4)
295+
padding <- rep(params$label.padding %||% unit(0.25, "lines"), length.out = 4)
289296
descent <- font_descent(
290297
family = data$family %||% "",
291298
face = data$fontface %||% 1,
@@ -298,17 +305,17 @@ draw_key_label <- function(data, params, size) {
298305
angle = data$angle,
299306
just = c(data$hjust, data$vjust),
300307
padding = padding,
301-
r = params$label.r,
308+
r = params$label.r %||% unit(0.15, "lines"),
302309
text.gp = gpar(
303310
col = data$colour %||% "black",
304311
fontfamily = data$family %||% "",
305312
fontface = data$fontface %||% 1,
306313
fontsize = (data$size %||% 3.88) * .pt
307314
),
308315
rect.gp = gpar(
309-
col = if (isTRUE(all.equal(params$label.size, 0))) NA else data$colour,
316+
col = if (isTRUE(all.equal(params$label.size, 0))) NA else data$colour,
310317
fill = alpha(data$fill %||% "white", data$alpha),
311-
lwd = params$label.size * .pt
318+
lwd = params$label.size * .pt
312319
)
313320
)
314321
angle <- deg2rad(data$angle %||% 0)

0 commit comments

Comments
 (0)