From cabddc6ddfa872b21c7cff76a099cd12719dbe12 Mon Sep 17 00:00:00 2001
From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com>
Date: Tue, 16 Mar 2021 03:19:52 +0900
Subject: [PATCH] Change the color of color-picker icon even when the text tool
is selected (#11642)
---
.../ui/components/whiteboard/whiteboard-toolbar/component.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
index 036aa3dd87..b7211f23e2 100755
--- a/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/component.jsx
@@ -283,7 +283,7 @@ class WhiteboardToolbar extends Component {
* 4. Trigger initial animation for the icons
*/
// 1st case
- if (this.thicknessListIconRadius && this.thicknessListIconColor) {
+ if ( (this.thicknessListIconRadius && this.thicknessListIconColor) || annotationSelected.value === 'text') {
if (colorSelected.value !== prevState.colorSelected.value) {
// 1st case b)
if (annotationSelected.value !== 'text') {
@@ -291,7 +291,7 @@ class WhiteboardToolbar extends Component {
}
// 1st case a)
this.colorListIconColor.beginElement();
- // 2nd case
+ // 2nd case - never happens when the text tool is selected
} else if (thicknessSelected.value !== prevState.thicknessSelected.value) {
this.thicknessListIconRadius.beginElement();
// 3rd case
--
GitLab