Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transparent fill of panel borders #5784

Merged
merged 4 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
systems (@teunbrand, #4690).
* `geom_tile()` computes default widths and heights per panel instead of
per layer (@teunbrand, #5740).
* The `fill` of the `panel.border` theme setting is ignored and forced to be
transparent (#5782).

# ggplot2 3.5.1

Expand Down
4 changes: 3 additions & 1 deletion R/coord-.R
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ Coord <- ggproto("Coord",
labels
},

render_fg = function(panel_params, theme) element_render(theme, "panel.border"),
render_fg = function(panel_params, theme) {
element_render(theme, "panel.border", fill = NA)
},

render_bg = function(self, panel_params, theme) {
cli::cli_abort("{.fn {snake_class(self)}} has not implemented a {.fn render_bg} method.")
Expand Down
4 changes: 2 additions & 2 deletions R/coord-polar.R
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ CoordPolar <- ggproto("CoordPolar", Coord,

render_fg = function(self, panel_params, theme) {
if (is.null(panel_params$theta.major)) {
return(element_render(theme, "panel.border"))
return(element_render(theme, "panel.border", fill = NA))
}
arc <- self$start + c(0, 2 * pi)
dir <- self$direction
Expand Down Expand Up @@ -297,7 +297,7 @@ CoordPolar <- ggproto("CoordPolar", Coord,
unit(0.45 * cos(theta) + 0.5, "native"),
hjust = 0.5, vjust = 0.5
),
element_render(theme, "panel.border")
element_render(theme, "panel.border", fill = NA)
)
},

Expand Down
6 changes: 4 additions & 2 deletions R/coord-radial.R
Original file line number Diff line number Diff line change
Expand Up @@ -357,11 +357,13 @@ CoordRadial <- ggproto("CoordRadial", Coord,

render_fg = function(self, panel_params, theme) {

border <- element_render(theme, "panel.border", fill = NA)

if (!self$r_axis_inside) {
out <- grobTree(
panel_guides_grob(panel_params$guides, "theta", theme),
panel_guides_grob(panel_params$guides, "theta.sec", theme),
element_render(theme, "panel.border")
border
)
return(out)
}
Expand All @@ -381,7 +383,7 @@ CoordRadial <- ggproto("CoordRadial", Coord,
panel_guides_grob(panel_params$guides, "theta", theme),
panel_guides_grob(panel_params$guides, "theta.sec", theme),
left, right,
element_render(theme, "panel.border")
border
)
},

Expand Down
8 changes: 4 additions & 4 deletions R/theme-defaults.R
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ theme_bw <- function(base_size = 11, base_family = "",
theme(
# white background and dark border
panel.background = element_rect(fill = "white", colour = NA),
panel.border = element_rect(fill = NA, colour = "grey20"),
panel.border = element_rect(colour = "grey20"),
# make gridlines dark, same contrast with white as in theme_grey
panel.grid = element_line(colour = "grey92"),
panel.grid.minor = element_line(linewidth = rel(0.5)),
Expand Down Expand Up @@ -303,7 +303,7 @@ theme_linedraw <- function(base_size = 11, base_family = "",
# 0.5 clipped looks like 0.25

# pure black panel border and grid lines, but thinner
panel.border = element_rect(fill = NA, colour = "black", linewidth = rel(1)),
panel.border = element_rect(colour = "black", linewidth = rel(1)),
panel.grid = element_line(colour = "black"),
panel.grid.major = element_line(linewidth = rel(0.1)),
panel.grid.minor = element_line(linewidth = rel(0.05)),
Expand Down Expand Up @@ -337,7 +337,7 @@ theme_light <- function(base_size = 11, base_family = "",
theme(
# white panel with light grey border
panel.background = element_rect(fill = "white", colour = NA),
panel.border = element_rect(fill = NA, colour = "grey70", linewidth = rel(1)),
panel.border = element_rect(colour = "grey70", linewidth = rel(1)),
# light grey, thinner gridlines
# => make them slightly darker to keep acceptable contrast
panel.grid = element_line(colour = "grey87"),
Expand Down Expand Up @@ -612,7 +612,7 @@ theme_test <- function(base_size = 11, base_family = "",
legend.box.spacing = rel(2),

panel.background = element_rect(fill = "white", colour = NA),
panel.border = element_rect(fill = NA, colour = "grey20"),
panel.border = element_rect(colour = "grey20"),
panel.grid.major = element_blank(),
panel.grid.minor = element_blank(),
panel.spacing = NULL,
Expand Down
2 changes: 1 addition & 1 deletion R/theme.R
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
#' # Panels --------------------------------------------------------------------
#'
#' p1 + theme(panel.background = element_rect(fill = "white", colour = "grey50"))
#' p1 + theme(panel.border = element_rect(linetype = "dashed", fill = NA))
#' p1 + theme(panel.border = element_rect(linetype = "dashed"))
#' p1 + theme(panel.grid.major = element_line(colour = "black"))
#' p1 + theme(
#' panel.grid.major.y = element_blank(),
Expand Down
2 changes: 1 addition & 1 deletion man/theme.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.