@@ -390,7 +390,7 @@ renderCachedPlot <- function(expr,
390
390
height <- fitDims $ height
391
391
})
392
392
393
- colors <- getColors (autoTheme , session , outputName )
393
+ theme <- getTheme (autoTheme , session , outputName )
394
394
pixelratio <- session $ clientData $ pixelratio %OR % 1
395
395
396
396
do.call(" drawPlot" , c(
@@ -402,8 +402,7 @@ renderCachedPlot <- function(expr,
402
402
height = height ,
403
403
pixelratio = pixelratio ,
404
404
res = res ,
405
- bg = colors $ bg ,
406
- fg = colors $ fg
405
+ theme = theme
407
406
),
408
407
args
409
408
))
@@ -439,9 +438,9 @@ renderCachedPlot <- function(expr,
439
438
width <- fitDims $ width
440
439
height <- fitDims $ height
441
440
pixelratio <- session $ clientData $ pixelratio %OR % 1
442
- colors <- getColors (autoTheme , session , outputName )
441
+ theme <- getTheme (autoTheme , session , outputName )
443
442
444
- key <- digest :: digest(list (outputName , userCacheKeyResult , width , height , res , pixelratio , colors ), " xxhash64" )
443
+ key <- digest :: digest(list (outputName , userCacheKeyResult , width , height , res , pixelratio , theme ), " xxhash64" )
445
444
446
445
plotObj <- cache $ get(key )
447
446
@@ -455,7 +454,7 @@ renderCachedPlot <- function(expr,
455
454
width = width ,
456
455
height = height ,
457
456
pixelratio = pixelratio ,
458
- colors = colors
457
+ theme = theme
459
458
))
460
459
}
461
460
@@ -478,7 +477,7 @@ renderCachedPlot <- function(expr,
478
477
width = width ,
479
478
height = height ,
480
479
pixelratio = pixelratio ,
481
- colors = colors
480
+ theme = theme
482
481
)
483
482
}
484
483
)
@@ -488,7 +487,7 @@ renderCachedPlot <- function(expr,
488
487
width <- result $ width
489
488
height <- result $ height
490
489
pixelratio <- result $ pixelratio
491
- colors <- result $ colors
490
+ theme <- result $ theme
492
491
493
492
# Three possibilities when we get here:
494
493
# 1. There was a cache hit. No need to set a value in the cache.
@@ -510,8 +509,7 @@ renderCachedPlot <- function(expr,
510
509
height ,
511
510
pixelratio ,
512
511
res ,
513
- bg = colors $ bg ,
514
- fg = colors $ fg
512
+ theme
515
513
),
516
514
args
517
515
))
0 commit comments