diff --git a/DESCRIPTION b/DESCRIPTION index f52913740..6cdba80a2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -98,8 +98,7 @@ Suggests: future, dygraphs, thematic, - ragg, - showtext + ragg Remotes: rstudio/htmltools, rstudio/shinytest, diff --git a/R/imageutils.R b/R/imageutils.R index 40c9a715f..8cc135674 100644 --- a/R/imageutils.R +++ b/R/imageutils.R @@ -6,13 +6,14 @@ startPNG <- function(filename, width, height, res, ...) { # Finally, if neither quartz nor Cairo, use png(). if (capabilities("aqua")) { pngfun <- grDevices::png - } else if ((getOption('shiny.usecairo') %OR% TRUE) && - nchar(system.file(package = "Cairo"))) { - pngfun <- Cairo::CairoPNG - } else if (nchar(system.file(package = "ragg"))) { + } else if ((getOption('shiny.useragg') %OR% TRUE) && + nchar(system.file(package = "ragg"))) { pngfun <- ragg::agg_png args$background <- args$background %OR% args$bg args$bg <- NULL + } else if ((getOption('shiny.usecairo') %OR% TRUE) && + nchar(system.file(package = "Cairo"))) { + pngfun <- Cairo::CairoPNG } else { pngfun <- grDevices::png }