Merge pull request #92 from ArthurLobopro/some-changes

Some changes

Author: ArthurLobopro

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.22.0
+
+Feat: New Watermark position input
+
 ## 1.21.1
 
 Feat: New expansible menus on One Time Config

l10n/bundle.l10n.pt-br.json

@@ -58,6 +58,6 @@
     "You can edit the default Watermark text clicking": "Você pode editar o texto padrão da Marca D'água clicando",
     "Enables manual resizing of the `Snap Window`.": "Ativa o redimencionamento manual da `Snap Window`.",
     "Disabling this will also reset the `Snap Window` size.": "Desativar isso também irá resetar o tamanho da `Snap Window`.",
-    "Watermark Y position": "Posição Y da marca d'água",
-    "Watermark X position": "Posição X da marca d'água"
+    "Show Watermark": "Mostrar marca d'água",
+    "The position of the watermark in the snapshot. Top positions are only available when `Target` is `container`": "A posição da marca d'água na captura de tela. Posições superiores só são disponíveis quando `Alvo` é `container`"
 }

package.json

@@ -2,7 +2,7 @@
   "name": "easy-codesnap",
   "displayName": "Easy CodeSnap",
   "description": "Take beautiful screenshots of your code 📷",
-  "version": "1.21.1",
+  "version": "1.22.0",
   "l10n": "./l10n",
   "repository": {
     "type": "git",

screenshots/one-time-config.gif

@@ -16,7 +16,7 @@ export function getSettings(group: string, keys: string[]) {
             config[key] = languageSettings[`${group}.${key}`];
         }
 
-        config[key] = config[key] ?? settings.get(key);
+        config[key] ??= settings.get(key);
 
         return config;
     }, {} as untypedObject);

src/util.ts

@@ -31,10 +31,9 @@ export class SessionConfig {
             ? Object.assign({}, this.__config, config)
             : config;
 
-        newConfig.zoom = newConfig.zoom ?? 100;
-        newConfig.shouldUpdateTitle = newConfig.shouldUpdateTitle ?? true;
-        newConfig.watermarkText =
-            newConfig.watermarkText ?? newConfig.defaultWatermarkText;
+        newConfig.zoom ??= 100;
+        newConfig.shouldUpdateTitle ??= true;
+        newConfig.watermarkText ??= newConfig.defaultWatermarkText;
 
         this.__config = newConfig as WebviewConfig;
 

src/webview/SessionConfig.ts

@@ -52,8 +52,6 @@ export const windowStyleSelect = getSelect("windowStyle");
 export const zoomSelect = getSelect("zoom");
 export const saveScaleSelect = getSelect("saveScale");
 export const aspectRatioSelect = getSelect("aspectRatio");
-export const watermarkPositionYSelect = getSelect("watermarkPosition-Y");
-export const watermarkPositionXSelect = getSelect("watermarkPosition-X");
 
 //Buttons
 export const openSettingsButton = getButton("open-settings");
@@ -63,3 +61,13 @@ export const toggleLockedButton = getButton("toggle-lock");
 export const toggleLinkedButton = getButton("toggle-link");
 export const zoomInButton = getButton("zoom-in");
 export const zoomOutButton = getButton("zoom-out");
+
+//Watermark
+function getRadio(value: string) {
+    return $<HTMLInputElement>(`input[value="${value}"]`);
+}
+
+export const watermarkTopLeft = getRadio("top-left");
+export const watermarkTopRight = getRadio("top-right");
+export const watermarkBottomLeft = getRadio("bottom-left");
+export const watermarkBottomRight = getRadio("bottom-right");

src/webview/ui/elements.ts

@@ -1,14 +1,10 @@
-import type { ExtensionConfig } from "../../../types";
-import { SessionConfig } from "../../SessionConfig";
 import {
     aspectRatioSelect,
     roundingLevelSelect,
     saveFormatSelect,
     saveScaleSelect,
     shutterActionSelect,
     targetSelect,
-    watermarkPositionXSelect,
-    watermarkPositionYSelect,
     windowStyleSelect,
     zoomSelect,
 } from "../elements";
@@ -23,26 +19,4 @@ export function addSelectListeners() {
     handleSelectBasedChange(windowStyleSelect, "windowStyle");
     handleSelectBasedChange(zoomSelect, "zoom");
     handleSelectBasedChange(aspectRatioSelect, "aspectRatio");
-
-    watermarkPositionXSelect.addEventListener("change", () => {
-        const watermarkPosition = SessionConfig.get("watermarkPosition");
-
-        SessionConfig.set({
-            watermarkPosition: [
-                watermarkPosition.split("-")[0],
-                watermarkPositionXSelect.value,
-            ].join("-") as ExtensionConfig["watermarkPosition"],
-        });
-    });
-
-    watermarkPositionYSelect.addEventListener("change", () => {
-        const watermarkPosition = SessionConfig.get("watermarkPosition");
-
-        SessionConfig.set({
-            watermarkPosition: [
-                watermarkPositionYSelect.value,
-                watermarkPosition.split("-")[1],
-            ].join("-") as ExtensionConfig["watermarkPosition"],
-        });
-    });
 }

src/webview/ui/listeners/addSelectListeners.ts

@@ -1,3 +1,5 @@
+import type { WebviewConfig } from "../../../types";
+import { SessionConfig } from "../../SessionConfig";
 import {
     enableResizingInput,
     highlightLineNumberInput,
@@ -9,7 +11,11 @@ import {
     toggleLinkedButton,
     toggleLockedButton,
     transparentBackgroundInput,
+    watermarkBottomLeft,
+    watermarkBottomRight,
     watermarkInput,
+    watermarkTopLeft,
+    watermarkTopRight,
 } from "../elements";
 import { handleToggleBasedChange, handleToggleBasedClick } from "./handlers";
 
@@ -31,4 +37,20 @@ export function addToogleListeners() {
 
     handleToggleBasedClick(toggleLinkedButton, "isLinked");
     handleToggleBasedClick(toggleLockedButton, "isLocked");
+
+    [
+        watermarkTopLeft,
+        watermarkTopRight,
+        watermarkBottomRight,
+        watermarkBottomLeft,
+    ].forEach((input) => {
+        input.addEventListener("change", () => {
+            if (input.checked) {
+                SessionConfig.set({
+                    watermarkPosition:
+                        input.value as WebviewConfig["watermarkPosition"],
+                });
+            }
+        });
+    });
 }

src/webview/ui/listeners/addToggleListeners.ts

@@ -15,8 +15,6 @@ import {
     targetSelect,
     transparentBackgroundInput,
     watermarkInput,
-    watermarkPositionXSelect,
-    watermarkPositionYSelect,
     windowStyleSelect,
 } from "../elements";
 
@@ -58,7 +56,6 @@ export class OneTimeConfigUpdater extends Updater {
             saveScale,
             highlightLineNumber,
             watermark,
-            watermarkPosition,
         } = SessionConfig.get();
 
         showWindowTitleInput.checked = showWindowTitle;
@@ -82,11 +79,5 @@ export class OneTimeConfigUpdater extends Updater {
         saveFormatSelect.value = saveFormat;
         windowStyleSelect.value = windowStyle;
         saveScaleSelect.value = saveScale.toString();
-
-        if (watermarkPosition) {
-            const [watermarkY, watermarkX] = watermarkPosition.split("-");
-            watermarkPositionXSelect.value = watermarkX;
-            watermarkPositionYSelect.value = watermarkY;
-        }
     }
 }