Stricter unit handling (#3034)

Author: thomasp85

R/coord-.r

@@ -64,12 +64,11 @@ Coord <- ggproto("Coord",
   render_fg = function(panel_params, theme) element_render(theme, "panel.border"),
 
   render_bg = function(panel_params, theme) {
-    x.major <- if (length(panel_params$x.major) > 0) unit(panel_params$x.major, "native")
-    x.minor <- if (length(panel_params$x.minor) > 0) unit(panel_params$x.minor, "native")
-    y.major <- if (length(panel_params$y.major) > 0) unit(panel_params$y.major, "native")
-    y.minor <- if (length(panel_params$y.minor) > 0) unit(panel_params$y.minor, "native")
-
-    guide_grid(theme, x.minor, x.major, y.minor, y.major)
+    guide_grid(theme,
+               panel_params$x.minor,
+               panel_params$x.major,
+               panel_params$y.minor,
+               panel_params$y.major)
   },
 
   render_axis_h = function(panel_params, theme) {

R/guide-colorbar.r

@@ -507,7 +507,7 @@ guide_gengrob.colorbar <- function(guide, theme) {
   grob.background <- element_render(theme, "legend.background")
 
   # padding
-  padding <- convertUnit(theme$legend.margin %||% margin(), "cm")
+  padding <- convertUnit(theme$legend.margin %||% margin(), "cm", valueOnly = TRUE)
   widths <- c(padding[4], widths, padding[2])
   heights <- c(padding[1], heights, padding[3])
 

R/guide-legend.r

@@ -654,7 +654,7 @@ guide_gengrob.legend <- function(guide, theme) {
   krows <- rep(vps$key.row, each = ngeom)
 
   # padding
-  padding <- convertUnit(theme$legend.margin %||% margin(), "cm")
+  padding <- convertUnit(theme$legend.margin %||% margin(), "cm", valueOnly = TRUE)
   widths <- c(padding[4], widths, padding[2])
   heights <- c(padding[1], heights, padding[3])
 

R/guides-grid.r

@@ -1,4 +1,8 @@
 # Produce a grob to be used as for panel backgrounds
+# minor and major grid line positions are given as fractional positions and will
+# be converted to `'native'` units by polylineGrob() downstream
+#
+# Any minor lines coinciding with major lines will be removed
 guide_grid <- function(theme, x.minor, x.major, y.minor, y.major) {
 
   x.minor <- setdiff(x.minor, x.major)