Skip to content

Commit d6ca14a

Browse files
new-sankakunew-sankaku
committed
サイドバーのペンで値が戻る問題を修正
1 parent affcd59 commit d6ca14a

File tree

4 files changed

+78
-88
lines changed

4 files changed

+78
-88
lines changed

‎js/sidebar/pen/pen-tools.js‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ clearPenSettings();
9696
let settingsHTML='';
9797
switch (type) {
9898
case MODE_PEN_PENCIL:
99-
settingsHTML+=addColor(MODE_PEN_PENCIL+'-color','color',penValueMap.getOrDefault(MODE_PEN_PENCIL+'-color','#000000'));
100-
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-line-width','size',1,150,penValueMap.getOrDefault(MODE_PEN_PENCIL+'-line-width',5));
101-
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-opacity','opacity',1,100,penValueMap.getOrDefault(MODE_PEN_PENCIL+'-opacity',100));
102-
settingsHTML+=addColor(MODE_PEN_PENCIL+'-shadow-color','shadow',penValueMap.getOrDefault(MODE_PEN_PENCIL+'-shadow-color','#000000'));
103-
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-shadow-line-width','size',0,150,penValueMap.getOrDefault(MODE_PEN_PENCIL+'-shadow-line-width',0));
104-
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-shadow-offset-x','svg_icon_shadow_offset_x',1,150,penValueMap.getOrDefault(MODE_PEN_PENCIL+'-shadow-offset-x',5));
105-
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-shadow-offset-y','svg_icon_shadow_offset_y',1,150,penValueMap.getOrDefault(MODE_PEN_PENCIL+'-shadow-offset-y',5));
99+
settingsHTML+=addColor(MODE_PEN_PENCIL+'-color','color',sidebarValueMap.getOrDefault(MODE_PEN_PENCIL+'-color','#000000'));
100+
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-line-width','size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_PENCIL+'-line-width',5));
101+
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-opacity','opacity',1,100,sidebarValueMap.getOrDefault(MODE_PEN_PENCIL+'-opacity',100));
102+
settingsHTML+=addColor(MODE_PEN_PENCIL+'-shadow-color','shadow',sidebarValueMap.getOrDefault(MODE_PEN_PENCIL+'-shadow-color','#000000'));
103+
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-shadow-line-width','size',0,150,sidebarValueMap.getOrDefault(MODE_PEN_PENCIL+'-shadow-line-width',0));
104+
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-shadow-offset-x','svg_icon_shadow_offset_x',1,150,sidebarValueMap.getOrDefault(MODE_PEN_PENCIL+'-shadow-offset-x',5));
105+
settingsHTML+=addSlider(MODE_PEN_PENCIL+'-shadow-offset-y','svg_icon_shadow_offset_y',1,150,sidebarValueMap.getOrDefault(MODE_PEN_PENCIL+'-shadow-offset-y',5));
106106
settingsHTML+=addDropDownByStyle('line-style','lineStyle');
107107
$('tool-settings').innerHTML=settingsHTML;
108108

@@ -117,16 +117,16 @@ drawingLineStyle=$("line-style");
117117

118118
break;
119119
case MODE_PEN_OUTLINE:
120-
settingsHTML+=addColor(MODE_PEN_OUTLINE+'-main-color','color',penValueMap.getOrDefault(MODE_PEN_OUTLINE+'-color','#000000'));
121-
settingsHTML+=addColor(MODE_PEN_OUTLINE+'-outline1-color','outline1-color',penValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline1-color','#FFFFFF'));
122-
settingsHTML+=addColor(MODE_PEN_OUTLINE+'-outline2-color','outline2-color',penValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline2-color','#FF0000'));
120+
settingsHTML+=addColor(MODE_PEN_OUTLINE+'-main-color','color',sidebarValueMap.getOrDefault(MODE_PEN_OUTLINE+'-color','#000000'));
121+
settingsHTML+=addColor(MODE_PEN_OUTLINE+'-outline1-color','outline1-color',sidebarValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline1-color','#FFFFFF'));
122+
settingsHTML+=addColor(MODE_PEN_OUTLINE+'-outline2-color','outline2-color',sidebarValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline2-color','#FF0000'));
123123

124-
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-main-width','size',1,150,penValueMap.getOrDefault(MODE_PEN_OUTLINE+'-main-width',10));
125-
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-outline1-width','outline1-size',1,150,penValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline1-width',2));
126-
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-outline2-width','outline2-size',1,150,penValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline2-width',1));
124+
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-main-width','size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_OUTLINE+'-main-width',10));
125+
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-outline1-width','outline1-size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline1-width',2));
126+
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-outline2-width','outline2-size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline2-width',1));
127127

128-
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-outline1-opacity','outline1-opacity',1,100,penValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline1-opacity',100));
129-
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-outline2-opacity','outline2-opacity',1,100,penValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline2-opacity',100));
128+
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-outline1-opacity','outline1-opacity',1,100,sidebarValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline1-opacity',100));
129+
settingsHTML+=addSlider(MODE_PEN_OUTLINE+'-outline2-opacity','outline2-opacity',1,100,sidebarValueMap.getOrDefault(MODE_PEN_OUTLINE+'-outline2-opacity',100));
130130
$('tool-settings').innerHTML=settingsHTML;
131131

132132
drawingMainColor=$(MODE_PEN_OUTLINE+'-main-color');
@@ -140,12 +140,12 @@ drawingOutline1Opacity=$(MODE_PEN_OUTLINE+'-outline1-opacity');
140140
drawingOutline2Opacity=$(MODE_PEN_OUTLINE+'-outline2-opacity');
141141
break;
142142
case MODE_PEN_CIRCLE:
143-
settingsHTML+=addColor(MODE_PEN_CIRCLE+'-color','color',penValueMap.getOrDefault(MODE_PEN_CIRCLE+'-color','#000000'));
144-
settingsHTML+=addSlider(MODE_PEN_CIRCLE+'-line-width','size',1,150,penValueMap.getOrDefault(MODE_PEN_CIRCLE+'-line-width',5));
145-
settingsHTML+=addColor(MODE_PEN_CIRCLE+'-shadow-color','shadow',penValueMap.getOrDefault(MODE_PEN_CIRCLE+'-shadow-color','#000000'));
146-
settingsHTML+=addSlider(MODE_PEN_CIRCLE+'-shadow-line-width','size',0,150,penValueMap.getOrDefault(MODE_PEN_CIRCLE+'-shadow-line-width',0));
147-
settingsHTML+=addSlider(MODE_PEN_CIRCLE+'-shadow-offset-x','svg_icon_shadow_offset_x',1,150,penValueMap.getOrDefault(MODE_PEN_CIRCLE+'-shadow-offset-x',5));
148-
settingsHTML+=addSlider(MODE_PEN_CIRCLE+'-shadow-offset-y','svg_icon_shadow_offset_y',1,150,penValueMap.getOrDefault(MODE_PEN_CIRCLE+'-shadow-offset-y',5));
143+
settingsHTML+=addColor(MODE_PEN_CIRCLE+'-color','color',sidebarValueMap.getOrDefault(MODE_PEN_CIRCLE+'-color','#000000'));
144+
settingsHTML+=addSlider(MODE_PEN_CIRCLE+'-line-width','size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_CIRCLE+'-line-width',5));
145+
settingsHTML+=addColor(MODE_PEN_CIRCLE+'-shadow-color','shadow',sidebarValueMap.getOrDefault(MODE_PEN_CIRCLE+'-shadow-color','#000000'));
146+
settingsHTML+=addSlider(MODE_PEN_CIRCLE+'-shadow-line-width','size',0,150,sidebarValueMap.getOrDefault(MODE_PEN_CIRCLE+'-shadow-line-width',0));
147+
settingsHTML+=addSlider(MODE_PEN_CIRCLE+'-shadow-offset-x','svg_icon_shadow_offset_x',1,150,sidebarValueMap.getOrDefault(MODE_PEN_CIRCLE+'-shadow-offset-x',5));
148+
settingsHTML+=addSlider(MODE_PEN_CIRCLE+'-shadow-offset-y','svg_icon_shadow_offset_y',1,150,sidebarValueMap.getOrDefault(MODE_PEN_CIRCLE+'-shadow-offset-y',5));
149149
$('tool-settings').innerHTML=settingsHTML;
150150

151151
drawingColor=$(MODE_PEN_CIRCLE+'-color');
@@ -156,43 +156,43 @@ drawingShadowOffsetX=$(MODE_PEN_CIRCLE+'-shadow-offset-x');
156156
drawingShadowOffsetY=$(MODE_PEN_CIRCLE+'-shadow-offset-y');
157157
break;
158158
case MODE_PEN_CRAYON:
159-
settingsHTML+=addColor(MODE_PEN_CRAYON+'-color','color',penValueMap.getOrDefault(MODE_PEN_CRAYON+'-color','#000000'));
160-
settingsHTML+=addSlider(MODE_PEN_CRAYON+'-line-width','size',1,150,penValueMap.getOrDefault(MODE_PEN_CRAYON+'-line-width',5));
161-
settingsHTML+=addSlider(MODE_PEN_CRAYON+'-opacity','opacity',1,100,penValueMap.getOrDefault(MODE_PEN_CRAYON+'-opacity',100));
159+
settingsHTML+=addColor(MODE_PEN_CRAYON+'-color','color',sidebarValueMap.getOrDefault(MODE_PEN_CRAYON+'-color','#000000'));
160+
settingsHTML+=addSlider(MODE_PEN_CRAYON+'-line-width','size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_CRAYON+'-line-width',5));
161+
settingsHTML+=addSlider(MODE_PEN_CRAYON+'-opacity','opacity',1,100,sidebarValueMap.getOrDefault(MODE_PEN_CRAYON+'-opacity',100));
162162
$('tool-settings').innerHTML=settingsHTML;
163163

164164
drawingColor=$(MODE_PEN_CRAYON+'-color');
165165
drawingWidth=$(MODE_PEN_CRAYON+'-line-width');
166166
drawingOpacity=$(MODE_PEN_CRAYON+'-opacity');
167167
break;
168168
case MODE_PEN_INK:
169-
settingsHTML+=addColor(MODE_PEN_INK+'-color','color',penValueMap.getOrDefault(MODE_PEN_INK+'-color','#000000'));
170-
settingsHTML+=addSlider(MODE_PEN_INK+'-line-width','size',1,150,penValueMap.getOrDefault(MODE_PEN_INK+'-line-width',5));
169+
settingsHTML+=addColor(MODE_PEN_INK+'-color','color',sidebarValueMap.getOrDefault(MODE_PEN_INK+'-color','#000000'));
170+
settingsHTML+=addSlider(MODE_PEN_INK+'-line-width','size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_INK+'-line-width',5));
171171
$('tool-settings').innerHTML=settingsHTML;
172172

173173
drawingColor=$(MODE_PEN_INK+'-color');
174174
drawingWidth=$(MODE_PEN_INK+'-line-width');
175175
break;
176176
case MODE_PEN_MARKER:
177-
settingsHTML+=addColor(MODE_PEN_MARKER+'-color','color',penValueMap.getOrDefault(MODE_PEN_MARKER+'-color','#000000'));
178-
settingsHTML+=addSlider(MODE_PEN_MARKER+'-line-width','size',1,150,penValueMap.getOrDefault(MODE_PEN_MARKER+'-line-width',5));
179-
settingsHTML+=addSlider(MODE_PEN_MARKER+'-opacity','opacity',1,100,penValueMap.getOrDefault(MODE_PEN_MARKER+'-opacity',100));
177+
settingsHTML+=addColor(MODE_PEN_MARKER+'-color','color',sidebarValueMap.getOrDefault(MODE_PEN_MARKER+'-color','#000000'));
178+
settingsHTML+=addSlider(MODE_PEN_MARKER+'-line-width','size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_MARKER+'-line-width',5));
179+
settingsHTML+=addSlider(MODE_PEN_MARKER+'-opacity','opacity',1,100,sidebarValueMap.getOrDefault(MODE_PEN_MARKER+'-opacity',100));
180180
$('tool-settings').innerHTML=settingsHTML;
181181

182182
drawingColor=$(MODE_PEN_MARKER+'-color');
183183
drawingWidth=$(MODE_PEN_MARKER+'-line-width');
184184
drawingOpacity=$(MODE_PEN_MARKER+'-opacity');
185185
break;
186186
case MODE_PEN_MOSAIC:
187-
settingsHTML+=addSlider(MODE_PEN_MOSAIC+'-circle-size','circle-size',1,250,penValueMap.getOrDefault(MODE_PEN_MOSAIC+'-circle-size',40));
188-
settingsHTML+=addSlider(MODE_PEN_MOSAIC+'-size','mosaic-size',1,250,penValueMap.getOrDefault(MODE_PEN_MOSAIC+'-size',8));
187+
settingsHTML+=addSlider(MODE_PEN_MOSAIC+'-circle-size','circle-size',1,250,sidebarValueMap.getOrDefault(MODE_PEN_MOSAIC+'-circle-size',40));
188+
settingsHTML+=addSlider(MODE_PEN_MOSAIC+'-size','mosaic-size',1,250,sidebarValueMap.getOrDefault(MODE_PEN_MOSAIC+'-size',8));
189189
$('tool-settings').innerHTML=settingsHTML;
190190

191191
drawingMosaicSize=$(MODE_PEN_MOSAIC+'-size');
192192
drawingMosaicCircleSize=$(MODE_PEN_MOSAIC+'-circle-size');
193193
break;
194194
case MODE_PEN_ERASER:
195-
settingsHTML+=addSlider(MODE_PEN_ERASER+'-line-width','size',1,150,penValueMap.getOrDefault(MODE_PEN_ERASER+'-line-width',5));
195+
settingsHTML+=addSlider(MODE_PEN_ERASER+'-line-width','size',1,150,sidebarValueMap.getOrDefault(MODE_PEN_ERASER+'-line-width',5));
196196
$('tool-settings').innerHTML=settingsHTML;
197197

198198
drawingWidth=$(MODE_PEN_ERASER+'-line-width');

‎js/sidebar/sidebar-ui.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ return this.has(key) ? this.get(key) : defaultValue;
33
};
44

55
const sidebarValueMap=new Map();
6-
const penValueMap=new Map();
7-
const effectValueMap=new Map();
8-
9-
function savePenValueMap(element) {
10-
penValueMap.set(element.id,element.value);
11-
}
12-
function saveEffectValueMap(element) {
13-
effectValueMap.set(element.id,element.value);
14-
}
156

167
function saveValueMap(element) {
178
sidebarValueMap.set(element.id,element.value);

‎js/sidebar/text/text-2-manager.js‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
const t2Map=new Map();
21
const MODE_T2_SHADOW="shadow";
32
const MODE_T2_aurora="aurora";
43
const MODE_T2_broken="broken";
@@ -67,19 +66,19 @@ var cName="";
6766
// cName = "fontT2Selector";
6867
// settingsHTML += "<div id='fontT2Selector'></div>"
6968
cName="Text";
70-
settingsHTML+=addTextArea(type+'-'+cName,cName,t2Map.getOrDefault(type+'-'+cName,'New Text'));
69+
settingsHTML+=addTextArea(type+'-'+cName,cName,sidebarValueMap.getOrDefault(type+'-'+cName,'New Text'));
7170
cName="FontSize";
72-
settingsHTML+=addSlider(type+'-'+cName,cName,1,300,t2Map.getOrDefault(type+'-'+cName,40));
71+
settingsHTML+=addSlider(type+'-'+cName,cName,1,300,sidebarValueMap.getOrDefault(type+'-'+cName,40));
7372
cName="LineHeight";
74-
settingsHTML+=addSlider(type+'-'+cName,cName,0.1,5,t2Map.getOrDefault(type+'-'+cName,1.2),0.1);
73+
settingsHTML+=addSlider(type+'-'+cName,cName,0.1,5,sidebarValueMap.getOrDefault(type+'-'+cName,1.2),0.1);
7574
cName="LetterSpacing";
76-
settingsHTML+=addSlider(type+'-'+cName,cName,-0.5,2,t2Map.getOrDefault(type+'-'+cName,0.4),0.1);
75+
settingsHTML+=addSlider(type+'-'+cName,cName,-0.5,2,sidebarValueMap.getOrDefault(type+'-'+cName,0.4),0.1);
7776
settingsHTML+=addAlignTypeButton(type);
7877
settingsHTML+=addOrientationButton(type);
7978
cName="TextColor";
80-
settingsHTML+=addColor(type+'-'+cName,cName,t2Map.getOrDefault(type+'-'+cName,'#35322a'));
79+
settingsHTML+=addColor(type+'-'+cName,cName,sidebarValueMap.getOrDefault(type+'-'+cName,'#35322a'));
8180
cName="FillOpacity";
82-
settingsHTML+=addSlider(type+'-'+cName,cName,0,1,t2Map.getOrDefault(type+'-'+cName,1),0.1);
81+
settingsHTML+=addSlider(type+'-'+cName,cName,0,1,sidebarValueMap.getOrDefault(type+'-'+cName,1),0.1);
8382

8483

8584

@@ -109,18 +108,18 @@ break;
109108

110109
case MODE_T2_SHADOW:
111110
cName="ShadowSize1";
112-
settingsHTML+=addSlider(type+'-'+cName,cName,0,3,t2Map.getOrDefault(type+'-'+cName,1));
111+
settingsHTML+=addSlider(type+'-'+cName,cName,0,3,sidebarValueMap.getOrDefault(type+'-'+cName,1));
113112
cName="ShadowOpacity1";
114-
settingsHTML+=addSlider(type+'-'+cName,cName,0,1,t2Map.getOrDefault(type+'-'+cName,1),0.1);
113+
settingsHTML+=addSlider(type+'-'+cName,cName,0,1,sidebarValueMap.getOrDefault(type+'-'+cName,1),0.1);
115114
cName="ShadowColor1";
116-
settingsHTML+=addColor(type+'-'+cName,cName,t2Map.getOrDefault(type+'-'+cName,'#ebe7e0'));
115+
settingsHTML+=addColor(type+'-'+cName,cName,sidebarValueMap.getOrDefault(type+'-'+cName,'#ebe7e0'));
117116

118117
cName="ShadowSize2";
119-
settingsHTML+=addSlider(type+'-'+cName,cName,0,5,t2Map.getOrDefault(type+'-'+cName,5));
118+
settingsHTML+=addSlider(type+'-'+cName,cName,0,5,sidebarValueMap.getOrDefault(type+'-'+cName,5));
120119
cName="ShadowOpacity2";
121-
settingsHTML+=addSlider(type+'-'+cName,cName,0,1,t2Map.getOrDefault(type+'-'+cName,1),0.1);
120+
settingsHTML+=addSlider(type+'-'+cName,cName,0,1,sidebarValueMap.getOrDefault(type+'-'+cName,1),0.1);
122121
cName="ShadowColor2";
123-
settingsHTML+=addColor(type+'-'+cName,cName,t2Map.getOrDefault(type+'-'+cName,'#35322a'));
122+
settingsHTML+=addColor(type+'-'+cName,cName,sidebarValueMap.getOrDefault(type+'-'+cName,'#35322a'));
124123
break;
125124
}
126125

0 commit comments

Comments
 (0)