mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-16 09:57:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128 from bckmnn/dev/keep-color-and-width

Browse Source 
stroke color and width are now taken from current selection (#82)
This commit is contained in:
mntmn
2020-11-21 16:59:44 +01:00
committed by GitHub
parent 1d6514c8ee e3f5b34e37
commit 3129933713
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/javascripts/spacedeck_whiteboard.js
View File

@@ -589,8 +589,8 @@ function setup_whiteboard_directives() {
z: z, z: z,
w: 64, w: 64,
h: 64, h: 64,
stroke_color: $scope.active_style.stroke_color, stroke_color: $scope.active_style.stroke_color == "rgba(0,0,0,0)" ? "rgba(0,0,0,255)" : $scope.active_style.stroke_color,
stroke: 2, stroke: $scope.active_style.stroke == 0 ? 2 : $scope.active_style.stroke,
shape: "scribble" shape: "scribble"
}; };
@@ -625,8 +625,8 @@ function setup_whiteboard_directives() {
z: z, z: z,
w: 64, w: 64,
h: 64, h: 64,
stroke_color: $scope.active_style.stroke_color, stroke_color: $scope.active_style.stroke_color == "rgba(0,0,0,0)" ? "rgba(0,0,0,255)" : $scope.active_style.stroke_color,
stroke: 2, stroke: $scope.active_style.stroke == 0 ? 2 : $scope.active_style.stroke,
shape: "arrow" shape: "arrow"
}; };