Skip to content

Add base_line_size and base_rect_size parameters to theme defaults #2190

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 4 commits into from
Jul 3, 2017
Merged

Add base_line_size and base_rect_size parameters to theme defaults #2190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55c508b
Add base_line_size and base_rect_size parameters to theme defaults
karawoo Jul 3, 2017
c46fb10
Add tests for larger base_size values
karawoo Jul 3, 2017
789a5c5
Add line to NEWS.md
karawoo Jul 3, 2017
0f4f54f
Set default base_(line|rect)_size in function definition
karawoo Jul 3, 2017
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
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ggplot2 2.2.1.9000

* Theme functions now have the optional parameters `base_line_size` and
`base_rect_size` to control the default sizes of line and rectangle elements
(@karawoo, #2176).

* Fixed bug in `coord_polar` that prevented secondary axis ticks and labels
from being drawn (@dylan-stark, #2072)

Expand Down
106 changes: 82 additions & 24 deletions R/theme-defaults.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#'
#' @param base_size base font size
#' @param base_family base font family
#' @param base_line_size base size for line elements
#' @param base_rect_size base size for rect elements
#'
#' @details
#' \describe{
Expand Down Expand Up @@ -64,16 +66,22 @@ NULL
#' @include theme.r
#' @export
#' @rdname ggtheme
theme_grey <- function(base_size = 11, base_family = "") {
theme_grey <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
half_line <- base_size / 2

theme(
# Elements in this first block aren't used directly, but are inherited
# by others
line = element_line(colour = "black", size = 0.5, linetype = 1,
lineend = "butt"),
rect = element_rect(fill = "white", colour = "black",
size = 0.5, linetype = 1),
line = element_line(
colour = "black", size = base_line_size,
linetype = 1, lineend = "butt"
),
rect = element_rect(
fill = "white", colour = "black",
size = base_rect_size, linetype = 1
),
text = element_text(
family = base_family, face = "plain",
colour = "black", size = base_size,
Expand Down Expand Up @@ -177,9 +185,16 @@ theme_gray <- theme_grey

#' @export
#' @rdname ggtheme
theme_bw <- function(base_size = 11, base_family = "") {
theme_bw <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
# Starts with theme_grey and then modify some parts
theme_grey(base_size = base_size, base_family = base_family) %+replace%
theme_grey(
base_size = base_size,
base_family = base_family,
base_line_size = base_line_size,
base_rect_size = base_rect_size
) %+replace%
theme(
# white background and dark border
panel.background = element_rect(fill = "white", colour = NA),
Expand All @@ -198,10 +213,17 @@ theme_bw <- function(base_size = 11, base_family = "") {

#' @export
#' @rdname ggtheme
theme_linedraw <- function(base_size = 11, base_family = "") {
theme_linedraw <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
# Starts with theme_bw and then modify some parts
# = replace all greys with pure black or white
theme_bw(base_size = base_size, base_family = base_family) %+replace%
theme_bw(
base_size = base_size,
base_family = base_family,
base_line_size = base_line_size,
base_rect_size = base_rect_size
) %+replace%
theme(
# black text and ticks on the axes
axis.text = element_text(colour = "black", size = rel(0.8)),
Expand All @@ -224,9 +246,16 @@ theme_linedraw <- function(base_size = 11, base_family = "") {

#' @export
#' @rdname ggtheme
theme_light <- function(base_size = 11, base_family = "") {
theme_light <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
# Starts with theme_grey and then modify some parts
theme_grey(base_size = base_size, base_family = base_family) %+replace%
theme_grey(
base_size = base_size,
base_family = base_family,
base_line_size = base_line_size,
base_rect_size = base_rect_size
) %+replace%
theme(
# white panel with light grey border
panel.background = element_rect(fill = "white", colour = NA),
Expand All @@ -253,9 +282,16 @@ theme_light <- function(base_size = 11, base_family = "") {

#' @export
#' @rdname ggtheme
theme_dark <- function(base_size = 11, base_family = "") {
theme_dark <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
# Starts with theme_grey and then modify some parts
theme_grey(base_size = base_size, base_family = base_family) %+replace%
theme_grey(
base_size = base_size,
base_family = base_family,
base_line_size = base_line_size,
base_rect_size = base_rect_size
) %+replace%
theme(
# dark panel
panel.background = element_rect(fill = "grey50", colour = NA),
Expand All @@ -280,9 +316,16 @@ theme_dark <- function(base_size = 11, base_family = "") {

#' @export
#' @rdname ggtheme
theme_minimal <- function(base_size = 11, base_family = "") {
theme_minimal <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
# Starts with theme_bw and remove most parts
theme_bw(base_size = base_size, base_family = base_family) %+replace%
theme_bw(
base_size = base_size,
base_family = base_family,
base_line_size = base_line_size,
base_rect_size = base_rect_size
) %+replace%
theme(
axis.ticks = element_blank(),
legend.background = element_blank(),
Expand All @@ -298,8 +341,15 @@ theme_minimal <- function(base_size = 11, base_family = "") {

#' @export
#' @rdname ggtheme
theme_classic <- function(base_size = 11, base_family = ""){
theme_bw(base_size = base_size, base_family = base_family) %+replace%
theme_classic <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
theme_bw(
base_size = base_size,
base_family = base_family,
base_line_size = base_line_size,
base_rect_size = base_rect_size
) %+replace%
theme(
# no background and no grid
panel.border = element_blank(),
Expand All @@ -322,7 +372,9 @@ theme_classic <- function(base_size = 11, base_family = ""){

#' @export
#' @rdname ggtheme
theme_void <- function(base_size = 11, base_family = "") {
theme_void <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
theme(
# Use only inherited elements and make almost everything blank
# Only keep indispensable text
Expand All @@ -347,14 +399,20 @@ theme_void <- function(base_size = 11, base_family = "") {

#' @export
#' @rdname ggtheme
theme_test <- function(base_size = 11, base_family = "") {
theme_test <- function(base_size = 11, base_family = "",
base_line_size = base_size / 22,
base_rect_size = base_size / 22) {
half_line <- base_size / 2

theme(
line = element_line(colour = "black", size = 0.5, linetype = 1,
lineend = "butt"),
rect = element_rect(fill = "white", colour = "black",
size = 0.5, linetype = 1),
line = element_line(
colour = "black", size = base_line_size,
linetype = 1, lineend = "butt"
),
rect = element_rect(
fill = "white", colour = "black",
size = base_rect_size, linetype = 1
),
text = element_text(
family = base_family, face = "plain",
colour = "black", size = base_size,
Expand Down
28 changes: 18 additions & 10 deletions man/ggtheme.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading