Smaller changes

KlausSchaefers · May 9, 2024 · fd6f0d3 · fd6f0d3
1 parent bad0a10
commit fd6f0d3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 16 deletions.
diff --git a/src/canvas/Canvas.vue b/src/canvas/Canvas.vue
@@ -424,7 +424,7 @@ export default {
 			 */
 			this.settings = {
 				canvasTheme : "MatcAuto",
-				lineColor : "#3787f2",
+				lineColor : "#365fff",
 				lineWidth : 1,
 				storePropView : true,
 				moveMode : "ps",
@@ -599,10 +599,10 @@ export default {
 			css.add(win.body(), canvasTheme)
 			this._lastCanvasTheme = canvasTheme;
 		
-			if(canvasTheme=="MatcLight"){
-				this.defaultLineColor = "#49C0F0";
+			if(canvasTheme === "MatcLight"){
+				this.defaultLineColor = "#365fff";
 			} else {
-				this.defaultLineColor = "#49C0F0";
+				this.defaultLineColor = "#365fff";
 			}
 		},
 

diff --git a/src/canvas/ContextMenu.vue b/src/canvas/ContextMenu.vue
@@ -31,11 +31,11 @@ export default {
             left: 0,
             top: 0,
             options: [
-                { value: 'undo', icon: 'Undo', label: 'Undo', shortcut: 'STRG + Z' },
-                { value: 'redo', icon: 'Redo', label: 'Redo', shortcut: 'STRG + SHIFT + Z' },
+                { value: 'undo', icon: 'Undo', label: 'Undo', shortcut: 'CTRL + Z' },
+                { value: 'redo', icon: 'Redo', label: 'Redo', shortcut: 'CTRL + SHIFT + Z' },
                 { value: 1, css: 'MatcToolbarPopUpLine' },
-                { value: 'copy', icon: 'Copy', label: 'Copy', shortcut: 'STRG + C' },
-                { value: 'paste', icon: 'Paste', label: 'Paste', shortcut: 'STRG + V' },
+                { value: 'copy', icon: 'Copy', label: 'Copy', shortcut: 'CTRL + C' },
+                { value: 'paste', icon: 'Paste', label: 'Paste', shortcut: 'CTRL + V' },
                 { value: 'remove', icon: 'Delete', label: 'Delete', shortcut: 'DEL' },
                 { value: 'copyStyle', icon: 'CopyStyle', label: 'Copy Style', shortcut: '' }
             ]

diff --git a/src/canvas/DataView.vue b/src/canvas/DataView.vue
@@ -21,10 +21,10 @@ export default {
         setDataView (value) {
             this.logger.log(-1,"setDataView", "enter", value);
             if (value === true) {
-                css.add(this.container, "MatcCanvasDataView");
+                //css.add(this.container, "MatcCanvasDataView");
                 this.hasDataView = true
             } else {
-                css.remove(this.container, "MatcCanvasDataView");
+                // css.remove(this.container, "MatcCanvasDataView");
                 this.hasDataView = false
                 this.cleanDataView()
             }

diff --git a/src/canvas/Lines.vue b/src/canvas/Lines.vue
@@ -9,7 +9,7 @@ export default {
         return {
 			straightLineFunction: d3.line().x(function(d) { return d.x-.5; }).y(function(d) { return d.y-.5; }),
 			smoothLineFunction: d3.line().curve(d3.curveBasis).x(function(d) { return d.x-.5; }).y(function(d) { return d.y-.5; }), // basis
-			defaultLineColor : "#3787f2",
+			defaultLineColor : "#365fff",
 			defaultLineWidth: 2,
 			arrowCorrect : 3,
 			arrowSize : 8,

diff --git a/src/canvas/analytic/AnalyticCanvas.vue b/src/canvas/analytic/AnalyticCanvas.vue
@@ -380,7 +380,7 @@ export default {
        */
       this.settings = {
         canvasTheme: "MatcLight",
-        lineColor: "#333",
+        lineColor: "#365fff",
         lineWidth: 1,
         storePropView: true,
         moveMode: "ps",
@@ -480,9 +480,9 @@ export default {
       this._lastCanvasTheme = canvasTheme;
 
       if (canvasTheme == "MatcLight") {
-        this.defaultLineColor = "#49C0F0";
+        this.defaultLineColor = "#365fff";
       } else {
-        this.defaultLineColor = "#49C0F0";
+        this.defaultLineColor = "#365fff";
       }
     },
 

diff --git a/src/canvas/toolbar/components/CreateButton.vue b/src/canvas/toolbar/components/CreateButton.vue
@@ -488,7 +488,7 @@ export default {
 			this.scroller = this.$new(ScrollContainer);
 			this.scroller.placeAt(this.rightCntr);
 
-			this.iconCntr = db.div("").build();
+			this.iconCntr = db.div("MatcCreateBtnIconCntr").build();
 			this.scroller.wrap(this.iconCntr);
 
 
@@ -661,6 +661,7 @@ export default {
 				this.iconCntr.innerHTML="";
 			}
 			this.iconCntr.appendChild(cntr);
+			this.scrollToTop()
 		},
 
 		renderIcons (query){
@@ -693,8 +694,10 @@ export default {
 				this.iconCntr.innerHTML="";
 			}
 			this.iconCntr.appendChild(cntr);
+			this.scrollToTop()
 		},
 
+		
 		onCreateIcon (icon, e){
 			this.stopEvent(e);
 
@@ -915,9 +918,18 @@ export default {
 			}
 
 			this.iconCntr.appendChild(cntr);
+			this.scrollToTop()
+		},
 
+		scrollToTop () {
+			setTimeout(() => {
+				if (this.iconCntr.parentNode) {
+					this.iconCntr.parentNode.scrollTop = 0
+				}
+			}, 30)
 		},
 
+
 		renderScreenAndWidget (app, preview, db, size, isTemplate, elementDiv){
 	
 			this.tempOwn(on(elementDiv, touch.press, lang.hitch(this, "onCreate", app)));

diff --git a/src/style/variables.scss b/src/style/variables.scss
@@ -1,4 +1,4 @@
-$main_color: #365fff;
+$main_color: #617be4;
 
 $primary_color: #365fff;
 $primary_color_hover: #123ef0;