more carefullyl extract margins

Author: teunbrand

R/guide-axis-theta.R

@@ -154,7 +154,7 @@ GuideAxisTheta <- ggproto(
     }
 
     offset <- max(unit(0, "pt"), elements$major_length, elements$minor_length)
-    elements$offset <- offset + max(elements$text@margin %||% unit(0, "pt"))
+    elements$offset <- offset + max(try_prop(elements$text, "margin", default = unit(0, "pt")))
     elements
   },
 
@@ -281,7 +281,7 @@ GuideAxisTheta <- ggproto(
     angle <- key$theta + deg2rad(angle)
 
     # Set margin
-    margin <- rep(max(elements$text@margin), length.out = 4)
+    margin <- rep(max(try_prop(elements$text, "margin", default = unit(0, "pt"))), length.out = 4)
 
     # Measure size of each individual label
     single_labels <- lapply(labels, function(lab) {

R/guide-axis.R

@@ -616,8 +616,8 @@ label_angle_heuristic <- function(element, position, angle) {
   hjust <- switch(position, left = cosine, right = 1 - cosine, top = 1 - sine, sine)
   vjust <- switch(position, left = 1 - sine, right = sine, top = 1 - cosine, cosine)
 
-  element@angle <- angle %||% element@angle
-  element@hjust <- hjust %||% element@hjust
-  element@vjust <- vjust %||% element@vjust
+  element@angle <- angle %||% try_prop(element, "angle")
+  element@hjust <- hjust %||% try_prop(element, "hjust")
+  element@vjust <- vjust %||% try_prop(element, "vjust")
   element
 }

R/guide-legend.R

@@ -326,7 +326,7 @@ GuideLegend <- ggproto(
     # Resolve title. The trick here is to override the main text element, so
     # that any settings declared in `legend.title` will be honoured but we have
     # custom defaults for the guide.
-    margin <- calc_element("text", theme)@margin
+    margin <- try_prop(calc_element("text", theme), "margin")
     title <- theme(text = element_text(
       hjust = 0, vjust = 0.5,
       margin = position_margin(title_position, margin, gap)

R/plot-build.R

@@ -412,21 +412,23 @@ table_add_tag <- function(table, label, theme) {
 
   if (location %in% c("plot", "panel")) {
     if (!is.numeric(position)) {
+      hjust <- try_prop(element, "hjust", default = 0.5)
       if (right || left) {
-        x <- (1 - element@hjust) * width
+        x <- (1 - hjust) * width
         if (right) {
           x <- unit(1, "npc") - x
         }
       } else {
-        x <- unit(element@hjust, "npc")
+        x <- unit(hjust, "npc")
       }
       if (top || bottom) {
-        y <- (1 - element@vjust) * height
+        vjust <- try_prop(element, "vjust", default = 0.5)
+        y <- (1 - vjust) * height
         if (top) {
           y <- unit(1, "npc") - y
         }
       } else {
-        y <- unit(element@vjust, "npc")
+        y <- unit(vjust, "npc")
       }
     } else {
       x <- unit(position[1], "npc")