Skip to content

Commit acdeae4

Browse files
committed
new colour scales feed first argument to name
1 parent af6f4e8 commit acdeae4

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

R/scale-colour.R

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ scale_colour_continuous <- function(..., palette = NULL, aesthetics = "colour",
9393
}
9494
palette <- if (!is.null(palette)) as_continuous_pal(palette)
9595
continuous_scale(
96-
aesthetics, palette = palette, guide = guide, na.value = na.value,
96+
aesthetics = aesthetics, palette = palette, guide = guide,
97+
na.value = na.value, scale_name = deprecated(),
9798
...
9899
)
99100
}
@@ -115,7 +116,8 @@ scale_fill_continuous <- function(..., palette = NULL, aesthetics = "fill", guid
115116
}
116117
palette <- if (!is.null(palette)) as_continuous_pal(palette)
117118
continuous_scale(
118-
aesthetics, palette = palette, guide = guide, na.value = na.value,
119+
aesthetics = aesthetics, palette = palette, guide = guide,
120+
na.value = na.value, scale_name = deprecated(),
119121
...
120122
)
121123
}
@@ -137,7 +139,8 @@ scale_colour_binned <- function(..., palette = NULL, aesthetics = "colour", guid
137139
}
138140
palette <- if (!is.null(palette)) pal_binned(as_discrete_pal(palette))
139141
binned_scale(
140-
aesthetics, palette = palette, guide = guide, na.value = na.value,
142+
aesthetics = aesthetics, palette = palette, guide = guide,
143+
na.value = na.value, scale_name = deprecated(),
141144
...
142145
)
143146
}
@@ -158,7 +161,8 @@ scale_fill_binned <- function(..., palette = NULL, aesthetics = "fill", guide =
158161
}
159162
palette <- if (!is.null(palette)) pal_binned(as_discrete_pal(palette))
160163
binned_scale(
161-
aesthetics, palette = palette, guide = guide, na.value = na.value,
164+
aesthetics = aesthetics, palette = palette, guide = guide,
165+
na.value = na.value, scale_name = deprecated(),
162166
...
163167
)
164168
}
@@ -225,7 +229,8 @@ scale_colour_discrete <- function(..., palette = NULL, aesthetics = "colour", na
225229
}
226230
palette <- if (!is.null(palette)) as_discrete_pal(palette)
227231
discrete_scale(
228-
aesthetics, palette = palette, na.value = na.value,
232+
aesthetics = aesthetics, palette = palette, na.value = na.value,
233+
scale_name = deprecated(),
229234
...
230235
)
231236
}
@@ -246,7 +251,8 @@ scale_fill_discrete <- function(..., palette = NULL, aesthetics = "fill", na.val
246251
}
247252
palette <- if (!is.null(palette)) as_discrete_pal(palette)
248253
discrete_scale(
249-
aesthetics, palette = palette, na.value = na.value,
254+
aesthetics = aesthetics, palette = palette, na.value = na.value,
255+
scale_name = deprecated(),
250256
...
251257
)
252258
}

0 commit comments

Comments
 (0)