Skip to content

Commit 7ffab68

Browse files
teunbrandteunbrand
committed
get linetype from theme
1 parent c511902 commit 7ffab68

25 files changed

+123
-33
lines changed

‎R/annotation-logticks.R

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,12 @@ GeomLogticks <- ggproto("GeomLogticks", Geom,
228228
gTree(children = inject(gList(!!!ticks)))
229229
},
230230

231-
default_aes = aes(colour = from_theme(ink), linewidth = from_theme(thin), linetype = 1, alpha = 1)
231+
default_aes = aes(
232+
colour = from_theme(ink),
233+
linewidth = from_theme(thin),
234+
linetype = from_theme(linetype),
235+
alpha = 1
236+
)
232237
)
233238

234239

‎R/geom-abline.R

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,13 @@ GeomAbline <- ggproto("GeomAbline", Geom,
142142
GeomSegment$draw_panel(unique0(data), panel_params, coord, lineend = lineend)
143143
},
144144

145-
default_aes = aes(colour = from_theme(ink), linewidth = from_theme(thin), linetype = 1, alpha = NA),
145+
default_aes = aes(
146+
colour = from_theme(ink),
147+
linewidth = from_theme(thin),
148+
linetype = from_theme(linetype),
149+
alpha = NA
150+
),
151+
146152
required_aes = c("slope", "intercept"),
147153

148154
draw_key = draw_key_abline,

‎R/geom-boxplot.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ GeomBoxplot <- ggproto("GeomBoxplot", Geom,
330330
default_aes = aes(
331331
weight = 1, colour = from_theme(col_mix(ink, paper, 0.2)),
332332
fill = from_theme(paper), size = from_theme(pointsize),
333-
alpha = NA, shape = from_theme(pointshape), linetype = "solid",
333+
alpha = NA, shape = from_theme(pointshape), linetype = from_theme(linetype),
334334
linewidth = from_theme(thin)
335335
),
336336

‎R/geom-contour.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ GeomContour <- ggproto("GeomContour", GeomPath,
128128
weight = 1,
129129
colour = from_theme(accent),
130130
linewidth = from_theme(thin),
131-
linetype = 1,
131+
linetype = from_theme(linetype),
132132
alpha = NA
133133
)
134134
)

‎R/geom-crossbar.R

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,13 @@ GeomCrossbar <- ggproto("GeomCrossbar", Geom,
4040
GeomErrorbar$setup_data(data, params)
4141
},
4242

43-
default_aes = aes(colour = from_theme(ink), fill = NA, linewidth = from_theme(thin), linetype = 1,
44-
alpha = NA),
43+
default_aes = aes(
44+
colour = from_theme(ink),
45+
fill = NA,
46+
linewidth = from_theme(thin),
47+
linetype = from_theme(linetype),
48+
alpha = NA
49+
),
4550

4651
required_aes = c("x", "y", "ymin|xmin", "ymax|xmax"),
4752

‎R/geom-curve.R

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,14 @@ geom_curve <- function(mapping = NULL, data = NULL,
4040
#' @usage NULL
4141
#' @export
4242
GeomCurve <- ggproto("GeomCurve", GeomSegment,
43-
default_aes = aes(colour = from_theme(ink), linewidth = from_theme(thin), linetype = 1, alpha = NA),
43+
44+
default_aes = aes(
45+
colour = from_theme(ink),
46+
linewidth = from_theme(thin),
47+
linetype = from_theme(linetype),
48+
alpha = NA
49+
),
50+
4451
draw_panel = function(data, panel_params, coord, curvature = 0.5, angle = 90,
4552
ncp = 5, arrow = NULL, arrow.fill = NULL, lineend = "butt", na.rm = FALSE) {
4653

‎R/geom-density2d.R

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,12 @@ geom_density2d <- geom_density_2d
106106
#' @usage NULL
107107
#' @export
108108
GeomDensity2d <- ggproto("GeomDensity2d", GeomPath,
109-
default_aes = aes(colour = from_theme(accent), linewidth = from_theme(thin), linetype = 1, alpha = NA)
109+
default_aes = aes(
110+
colour = from_theme(accent),
111+
linewidth = from_theme(thin),
112+
linetype = from_theme(linetype),
113+
alpha = NA
114+
)
110115
)
111116

112117
#' @export

‎R/geom-dotplot.R

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,14 @@ GeomDotplot <- ggproto("GeomDotplot", Geom,
188188
required_aes = c("x", "y"),
189189
non_missing_aes = c("size", "shape"),
190190

191-
default_aes = aes(colour = from_theme(ink), fill = from_theme(ink), alpha = NA,
192-
stroke = 1, linetype = "solid", weight = 1),
191+
default_aes = aes(
192+
colour = from_theme(ink),
193+
fill = from_theme(ink),
194+
alpha = NA,
195+
stroke = 1,
196+
linetype = from_theme(linetype),
197+
weight = 1
198+
),
193199

194200
setup_data = function(data, params) {
195201
data$width <- data$width %||%

‎R/geom-errorbar.R

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,14 @@ geom_errorbar <- function(mapping = NULL, data = NULL,
2828
#' @usage NULL
2929
#' @export
3030
GeomErrorbar <- ggproto("GeomErrorbar", Geom,
31-
default_aes = aes(colour = from_theme(ink), linewidth = from_theme(thin), linetype = 1, width = 0.5,
32-
alpha = NA),
31+
32+
default_aes = aes(
33+
colour = from_theme(ink),
34+
linewidth = from_theme(thin),
35+
linetype = from_theme(linetype),
36+
width = 0.5,
37+
alpha = NA
38+
),
3339

3440
draw_key = draw_key_path,
3541

‎R/geom-errorbarh.R

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,14 @@ geom_errorbarh <- function(mapping = NULL, data = NULL,
5151
#' @usage NULL
5252
#' @export
5353
GeomErrorbarh <- ggproto("GeomErrorbarh", Geom,
54-
default_aes = aes(colour = from_theme(ink), linewidth = from_theme(thin), linetype = 1, height = 0.5,
55-
alpha = NA),
54+
55+
default_aes = aes(
56+
colour = from_theme(ink),
57+
linewidth = from_theme(thin),
58+
linetype = from_theme(linetype),
59+
height = 0.5,
60+
alpha = NA
61+
),
5662

5763
draw_key = draw_key_path,
5864

0 commit comments

Comments
 (0)