From bc774ad0739d8184de185c584a9e994b3ac33e0d Mon Sep 17 00:00:00 2001 From: Mitchell O'Hara-Wild Date: Fri, 12 Sep 2025 17:12:58 +1000 Subject: [PATCH 1/2] Fix draw_key_rect() not using data$fill for glyph fill --- NEWS.md | 4 ++++ R/legend-draw.R | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 1c82a69637..4ed2d7ec08 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ # ggplot2 (development version) +### Bug fixes + +* Fixed regression where `draw_key_rect()` stopped using `fill` colours (#6609). + # ggplot2 4.0.0 ## User facing diff --git a/R/legend-draw.R b/R/legend-draw.R index 25aedae0f7..621cde0aa2 100644 --- a/R/legend-draw.R +++ b/R/legend-draw.R @@ -54,7 +54,7 @@ draw_key_abline <- function(data, params, size) { #' @export #' @rdname draw_key draw_key_rect <- function(data, params, size) { - colour <- if (is.na(data$fill %||% NA)) data$colour + colour <- if (is.na(data$fill %||% NA)) data$colour else data$fill rectGrob(gp = gg_par( col = NA, fill = fill_alpha(colour %||% "grey20", data$alpha), From dd50a54dccb8615e36331edd7c6c7e6fd05ada72 Mon Sep 17 00:00:00 2001 From: Mitchell O'Hara-Wild Date: Fri, 12 Sep 2025 18:02:37 +1000 Subject: [PATCH 2/2] Accept snapshot and update NEWS --- NEWS.md | 3 ++- tests/testthat/_snaps/legend-draw/all-legend-keys.svg | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 4ed2d7ec08..10a4869519 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,8 @@ ### Bug fixes -* Fixed regression where `draw_key_rect()` stopped using `fill` colours (#6609). +* Fixed regression where `draw_key_rect()` stopped using `fill` colours + (@mitchelloharawild, #6609). # ggplot2 4.0.0 diff --git a/tests/testthat/_snaps/legend-draw/all-legend-keys.svg b/tests/testthat/_snaps/legend-draw/all-legend-keys.svg index e535bebe99..c1ea77a335 100644 --- a/tests/testthat/_snaps/legend-draw/all-legend-keys.svg +++ b/tests/testthat/_snaps/legend-draw/all-legend-keys.svg @@ -23,7 +23,7 @@ abline rect - + polygon blank