Add text size

NiTrO0FuN · Nov 15, 2023 · 5b92d95 · 5b92d95
1 parent f721a85
commit 5b92d95
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/src/components/CodeShower.vue b/src/components/CodeShower.vue
@@ -109,12 +109,15 @@ if(first() | duped() | dupefinished()) {
             if(shape.angle) {
               text+=`
     EGP:egpAngle(${i+1},${shape.angle})`
-            }
+            } //Size
             if(shape.strokeWidth && shape.strokeWidth>1 && !shape.filled) {
               text+=`
     EGP:egpSize(${i+1},${shape.strokeWidth})`
             }
-
+            if(shape.fontSize) {
+              text+=`
+    EGP:egpSize(${i+1},${shape.fontSize})`
+            }
           }
 
             

diff --git a/src/components/CreationZone.vue b/src/components/CreationZone.vue
@@ -54,7 +54,7 @@ export default {
         refreshCanva(dirty) {
             if(dirty) {this.selectedShape.set("dirty",true)}
             this.$refs.canva.refreshCanva()
-            this.selectedShape.set("dirty",false)
+            if(dirty){this.selectedShape.set("dirty",false)}
             this.refreshCode(this.$refs.canva.canvas.getObjects())
         },
         refreshCode(shapes) {

diff --git a/src/components/EGPCreation/CanvaVue.vue b/src/components/EGPCreation/CanvaVue.vue
@@ -95,6 +95,9 @@
                         top: 0, left:0,
                         fill: 'rgba(255,255,255,1)',
                         filled: true,
+                        fontSize: 20,
+                        fontFamily: "Tahoma",
+                        fontWeigth: "bold",
                         hasControls: false,
                         }
                     )

diff --git a/src/components/EGPCreation/ShapeEditor.vue b/src/components/EGPCreation/ShapeEditor.vue
@@ -39,9 +39,10 @@
         <q-separator v-if="isText" dark inset spaced />
         <div v-if="isText" class="row items-center justify-between text-white">
             {{$t("alignment")}}
-            <div class="row justify-around col-grow items-center">
+            <div class="row justify-evenly col-grow items-center">
                 <q-option-group class="text-align-wrapper" dark dense v-model="originX" :options="hAlign" color="primary" inline @update:model-value="this.$emit('change-selected')"/>
                 <q-option-group class="text-align-wrapper" dark dense v-model="originY" :options="vAlign" color="primary" @update:model-value="this.$emit('change-selected')"/>
+                <q-input dark debounce="200" filled style="max-width: 150px;" v-model.number="fontSize" type="number" :label="$t('fontSize')" @update:model-value="this.$emit('change-selected')"/>
             </div>
         </div>
         <q-separator dark inset spaced />
@@ -152,6 +153,15 @@ export default {
                 this.shape.set("strokeWidth",value)
             }
         },
+        fontSize: {
+            get () {
+                return this.shape.fontSize
+            },
+            set (value) {
+                if(!this.shape){return}
+                this.shape.set("fontSize",value)
+            }
+        },
         rx: {
             get () {
                 return this.shape.rx

diff --git a/src/localisation/loc.js b/src/localisation/loc.js
@@ -28,6 +28,7 @@ export default {
         position: "Position",
         points: "Points",
         size: "Size",
+        fontSize: "Text size",
         alignment: "Alignment",
         radii: "Radii",
         width: "Width",
@@ -65,6 +66,7 @@ export default {
         position: "Position",
         points: "Points",
         size: "Taille",
+        fontSize: "Taille du texte",
         alignment: "Alignement",
         radii: "Rayons",
         width: "Largeur",