@@ -367,14 +367,10 @@ FacetGrid <- ggproto("FacetGrid", Facet,
367
367
theme $ panel.spacing.y %|| % theme $ panel.spacing )
368
368
369
369
# Add axes
370
- axis_height_top <- max_height(axes $ x $ top )
371
- axis_height_bottom <- max_height(axes $ x $ bottom )
372
- axis_width_left <- max_width(axes $ y $ left )
373
- axis_width_right <- max_width(axes $ y $ right )
374
- panel_table <- gtable_add_rows(panel_table , axis_height_top , 0 )
375
- panel_table <- gtable_add_rows(panel_table , axis_height_bottom , - 1 )
376
- panel_table <- gtable_add_cols(panel_table , axis_width_left , 0 )
377
- panel_table <- gtable_add_cols(panel_table , axis_width_right , - 1 )
370
+ panel_table <- gtable_add_rows(panel_table , max_height(axes $ x $ top ), 0 )
371
+ panel_table <- gtable_add_rows(panel_table , max_height(axes $ x $ bottom ), - 1 )
372
+ panel_table <- gtable_add_cols(panel_table , max_width(axes $ y $ left ), 0 )
373
+ panel_table <- gtable_add_cols(panel_table , max_width(axes $ y $ right ), - 1 )
378
374
panel_pos_col <- panel_cols(panel_table )
379
375
panel_pos_rows <- panel_rows(panel_table )
380
376
@@ -392,7 +388,7 @@ FacetGrid <- ggproto("FacetGrid", Facet,
392
388
panel_pos_col <- panel_cols(panel_table )
393
389
if (switch_x ) {
394
390
if (! is.null(strips $ x $ bottom )) {
395
- if (inside_x || as.numeric( axis_height_bottom ) == 0 ) {
391
+ if (inside_x || all(vapply( axes $ x $ bottom , is.zero , logical ( 1 ))) ) {
396
392
panel_table <- gtable_add_rows(panel_table , max_height(strips $ x $ bottom ), - 2 )
397
393
panel_table <- gtable_add_grob(panel_table , strips $ x $ bottom , - 2 , panel_pos_col $ l , clip = " on" , name = paste0(" strip-b-" , seq_along(strips $ x $ bottom )), z = 2 )
398
394
} else {
@@ -403,7 +399,7 @@ FacetGrid <- ggproto("FacetGrid", Facet,
403
399
}
404
400
} else {
405
401
if (! is.null(strips $ x $ top )) {
406
- if (inside_x || as.numeric( axis_height_top ) == 0 ) {
402
+ if (inside_x || all(vapply( axes $ x $ top , is.zero , logical ( 1 ))) ) {
407
403
panel_table <- gtable_add_rows(panel_table , max_height(strips $ x $ top ), 1 )
408
404
panel_table <- gtable_add_grob(panel_table , strips $ x $ top , 2 , panel_pos_col $ l , clip = " on" , name = paste0(" strip-t-" , seq_along(strips $ x $ top )), z = 2 )
409
405
} else {
@@ -416,7 +412,7 @@ FacetGrid <- ggproto("FacetGrid", Facet,
416
412
panel_pos_rows <- panel_rows(panel_table )
417
413
if (switch_y ) {
418
414
if (! is.null(strips $ y $ left )) {
419
- if (inside_y || as.numeric( axis_width_left ) == 0 ) {
415
+ if (inside_y || all(vapply( axes $ y $ left , is.zero , logical ( 1 ))) ) {
420
416
panel_table <- gtable_add_cols(panel_table , max_width(strips $ y $ left ), 1 )
421
417
panel_table <- gtable_add_grob(panel_table , strips $ y $ left , panel_pos_rows $ t , 2 , clip = " on" , name = paste0(" strip-l-" , seq_along(strips $ y $ left )), z = 2 )
422
418
} else {
@@ -427,7 +423,7 @@ FacetGrid <- ggproto("FacetGrid", Facet,
427
423
}
428
424
} else {
429
425
if (! is.null(strips $ y $ right )) {
430
- if (inside_y || as.numeric( axis_width_right ) == 0 ) {
426
+ if (inside_y || all(vapply( axes $ y $ right , is.zero , logical ( 1 ))) ) {
431
427
panel_table <- gtable_add_cols(panel_table , max_width(strips $ y $ right ), - 2 )
432
428
panel_table <- gtable_add_grob(panel_table , strips $ y $ right , panel_pos_rows $ t , - 2 , clip = " on" , name = paste0(" strip-r-" , seq_along(strips $ y $ right )), z = 2 )
433
429
} else {
0 commit comments