From 0e7da09685fd60d37ed8151634616e58f1139c7f Mon Sep 17 00:00:00 2001
From: Johan Jeppsson <johanje@axis.com>
Date: Wed, 18 Nov 2020 16:46:02 +0100
Subject: [PATCH] Use active stroke/fill/text settings for shapes and notes

Change-Id: Idacd0f883435da387ce301db2dc6d919a2bb3be4
---
 public/javascripts/spacedeck_sections.js   | 6 +++---
 public/javascripts/spacedeck_whiteboard.js | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/javascripts/spacedeck_sections.js b/public/javascripts/spacedeck_sections.js
index 6846a94..dad65d8 100644
--- a/public/javascripts/spacedeck_sections.js
+++ b/public/javascripts/spacedeck_sections.js
@@ -1727,10 +1727,10 @@ var SpacedeckSections = {
         z: point.z,
         w: w,
         h: h,
-        stroke_color: "#ffffff",
-        text_color: "#ffffff",
+        stroke_color: this.active_style.stroke_color,
+        text_color: this.active_style.text_color,
         stroke: 0,
-        fill_color: "#000000",
+        fill_color: this.active_style.fill_color,
         shape: shape_type,
         valign: "middle",
         align: "center",
diff --git a/public/javascripts/spacedeck_whiteboard.js b/public/javascripts/spacedeck_whiteboard.js
index 9e65a68..a291253 100644
--- a/public/javascripts/spacedeck_whiteboard.js
+++ b/public/javascripts/spacedeck_whiteboard.js
@@ -549,8 +549,9 @@ function setup_whiteboard_directives() {
         h: note_h,
         align: "center",
         valign: "middle",
-        stroke_color: "#000000",
-        fill_color: "rgb(241, 196, 15)",
+        stroke_color: $scope.active_style.stroke_color,
+        text_color: $scope.active_style.text_color,
+        fill_color: $scope.active_style.fill_color,
         stroke: 0,
         padding_left: 10,
         padding_right: 10,