@@ -258,7 +258,10 @@ draw_key_smooth <- function(data, params, size) {
258
258
# ' @export
259
259
# ' @rdname draw_key
260
260
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
+ )
262
265
just <- rotate_just(data $ angle , data $ hjust , data $ vjust )
263
266
grob <- titleGrob(
264
267
data $ label ,
@@ -283,9 +286,13 @@ draw_key_text <- function(data, params, size) {
283
286
# ' @export
284
287
# ' @rdname draw_key
285
288
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
287
294
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 )
289
296
descent <- font_descent(
290
297
family = data $ family %|| % " " ,
291
298
face = data $ fontface %|| % 1 ,
@@ -298,17 +305,17 @@ draw_key_label <- function(data, params, size) {
298
305
angle = data $ angle ,
299
306
just = c(data $ hjust , data $ vjust ),
300
307
padding = padding ,
301
- r = params $ label.r ,
308
+ r = params $ label.r % || % unit( 0.15 , " lines " ) ,
302
309
text.gp = gpar(
303
310
col = data $ colour %|| % " black" ,
304
311
fontfamily = data $ family %|| % " " ,
305
312
fontface = data $ fontface %|| % 1 ,
306
313
fontsize = (data $ size %|| % 3.88 ) * .pt
307
314
),
308
315
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 ,
310
317
fill = alpha(data $ fill %|| % " white" , data $ alpha ),
311
- lwd = params $ label.size * .pt
318
+ lwd = params $ label.size * .pt
312
319
)
313
320
)
314
321
angle <- deg2rad(data $ angle %|| % 0 )
0 commit comments