Skip to content

Text key justification #5618

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jan 4, 2024
+29 −27
Merged

Text key justification #5618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42336b0
`compute_just()` returns non-characters as-is
teunbrand Jan 2, 2024
a20daef
`rotate_just()` handles character justification
teunbrand Jan 2, 2024
58fc10a
better text legend justification
teunbrand Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions R/geom-label.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,8 @@ GeomLabel <- ggproto("GeomLabel", Geom,
}

data <- coord$transform(data, panel_params)
if (is.character(data$vjust)) {
data$vjust <- compute_just(data$vjust, data$y, data$x, data$angle)
}
if (is.character(data$hjust)) {
data$hjust <- compute_just(data$hjust, data$x, data$y, data$angle)
}
data$vjust <- compute_just(data$vjust, data$y, data$x, data$angle)
data$hjust <- compute_just(data$hjust, data$x, data$y, data$angle)
if (!inherits(label.padding, "margin")) {
label.padding <- rep(label.padding, length.out = 4)
}
Expand Down
13 changes: 6 additions & 7 deletions R/geom-text.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,8 @@ GeomText <- ggproto("GeomText", Geom,

data <- coord$transform(data, panel_params)

if (is.character(data$vjust)) {
data$vjust <- compute_just(data$vjust, data$y, data$x, data$angle)
}
if (is.character(data$hjust)) {
data$hjust <- compute_just(data$hjust, data$x, data$y, data$angle)
}
data$vjust <- compute_just(data$vjust, data$y, data$x, data$angle)
data$hjust <- compute_just(data$hjust, data$x, data$y, data$angle)

size.unit <- resolve_text_unit(size.unit)

Expand All @@ -248,7 +244,10 @@ GeomText <- ggproto("GeomText", Geom,
draw_key = draw_key_text
)

compute_just <- function(just, a, b = a, angle = 0) {
compute_just <- function(just, a = 0.5, b = a, angle = 0) {
if (!is.character(just)) {
return(just)
}
# As justification direction is relative to the text, not the plotting area
# we need to swap x and y if text direction is rotated so that hjust is
# applied along y and vjust along x.
Expand Down
26 changes: 12 additions & 14 deletions R/legend-draw.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,17 +258,16 @@ draw_key_smooth <- function(data, params, size) {
#' @export
#' @rdname draw_key
draw_key_text <- function(data, params, size) {
data <- replace_null(
unclass(data),
label = "a", hjust = 0.5, vjust = 0.5, angle = 0
)
just <- rotate_just(data$angle, data$hjust, data$vjust)
grob <- titleGrob(
data <- replace_null(unclass(data), label = "a", angle = 0)
hjust <- compute_just(data$hjust %||% 0.5)
vjust <- compute_just(data$vjust %||% 0.5)
just <- rotate_just(data$angle, hjust, vjust)
grob <- titleGrob(
data$label,
x = unit(just$hjust, "npc"), y = unit(just$vjust, "npc"),
angle = data$angle,
hjust = data$hjust,
vjust = data$vjust,
hjust = hjust,
vjust = vjust,
gp = gpar(
col = alpha(data$colour %||% data$fill %||% "black", data$alpha),
fontfamily = data$family %||% "",
Expand All @@ -286,12 +285,11 @@ draw_key_text <- function(data, params, size) {
#' @export
#' @rdname draw_key
draw_key_label <- function(data, params, size) {
data <- replace_null(
unclass(data),
label = "a", hjust = 0.5, vjust = 0.5, angle = 0
)
data <- replace_null(unclass(data), label = "a", angle = 0)
params$label.size <- params$label.size %||% 0.25
just <- rotate_just(data$angle, data$hjust, data$vjust)
hjust <- compute_just(data$hjust %||% 0.5)
vjust <- compute_just(data$vjust %||% 0.5)
just <- rotate_just(data$angle, hjust, vjust)
padding <- rep(params$label.padding %||% unit(0.25, "lines"), length.out = 4)
descent <- font_descent(
family = data$family %||% "",
Expand All @@ -303,7 +301,7 @@ draw_key_label <- function(data, params, size) {
x = unit(just$hjust, "npc"),
y = unit(just$vjust, "npc") + descent,
angle = data$angle,
just = c(data$hjust, data$vjust),
just = c(hjust, vjust),
padding = padding,
r = params$label.r %||% unit(0.15, "lines"),
text.gp = gpar(
Expand Down
9 changes: 9 additions & 0 deletions R/margins.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,15 @@ rotate_just <- function(angle, hjust, vjust) {

angle <- (angle %||% 0) %% 360

if (is.character(hjust)) {
hjust <- match(hjust, c("left", "right")) - 1
hjust[is.na(hjust)] <- 0.5
}
if (is.character(vjust)) {
vjust <- match(vjust, c("bottom", "top")) - 1
vjust[is.na(vjust)] <- 0.5
}

# Apply recycle rules
size <- vec_size_common(angle, hjust, vjust)
angle <- vec_recycle(angle, size)
Expand Down