Replace :color-name-scheme with :color-syntax-system

misohena · Feb 15, 2025 · 7d80ece · 7d80ece
1 parent 3133fc5
commit 7d80ece
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/edraw-color-picker.el b/edraw-color-picker.el
@@ -3279,19 +3279,19 @@ of input changes."
                                          &optional default-syntax-system)
   (or
    (alist-get :color-syntax-system options)
+   ;; For compatibility (will be removed in the future)
    (pcase (alist-get :color-name-scheme options)
      ('web 'css)
      ('css 'css)
-     ('emacs 'emacs)
-     (_ (edraw-color-syntax-system-default
-         (or default-syntax-system 'emacs))))))
+     ('emacs 'emacs))
+   (edraw-color-syntax-system-default
+    (or default-syntax-system 'emacs))))
 
 (defun edraw-color-picker-color-to-string (color options)
   "Convert COLOR edraw-color object to string.
 
 Valid OPTIONS are:
 (:color-syntax-system . emacs or css)
-(:color-name-scheme . emacs or css or web)
 (:color-serializer-options . <plist>)
 (:color-info-props . <plist>)
 (:enable-opacity . nil or t)"
@@ -3310,7 +3310,6 @@ Valid OPTIONS are:
 
 Valid options are:
 (:color-syntax-system . emacs or css)
-(:color-name-scheme . emacs or css or web)
 (:enable-opacity . nil or t)"
   (let ((color-info
          (edraw-color-info-from-string
@@ -3327,7 +3326,6 @@ Valid options are:
 
 Valid options are:
 (:color-syntax-system . emacs or css)
-(:color-name-scheme . emacs or css or web)
 (:enable-opacity . nil or t)"
   (car (edraw-color-picker-color-info-from-string string options)))
 

diff --git a/edraw-property-editor.el b/edraw-property-editor.el
@@ -1238,7 +1238,7 @@ as a string."
      (format "%s: " (edraw-property-editor-property-display-name prop-name))
      old-value
      '("" "none")
-     `((:color-name-scheme . web)
+     `((:color-syntax-system . css)
        (:no-color . "none")
        ,@(when-let* ((image-scale (alist-get 'image-scale options)))
            (list
@@ -1260,7 +1260,7 @@ as a string."
                  (edraw-property-editor-property-display-name prop-name))
          old-value
          '("" "none")
-         `((:color-name-scheme . web)
+         `((:color-syntax-system . css)
            (:no-color . "none")
            ;; Preview
            ,@(list

diff --git a/edraw-shape-picker.el b/edraw-shape-picker.el
@@ -763,7 +763,7 @@
               edraw-shape-picker-ui-state
             (edraw-ui-state-object-default)))
          (options-for-read-color
-          `((:color-name-scheme . web)
+          `((:color-syntax-system . css)
             (:no-color . "none")
             ,@(when (and (boundp 'edraw-editor-image-scaling-factor)
                          edraw-editor-image-scaling-factor)

diff --git a/edraw-widget.el b/edraw-widget.el
@@ -64,7 +64,7 @@
    nil
    old-color
    '("" "none")
-   `((:color-name-scheme . web)
+   `((:color-syntax-system . css)
      (:no-color . "none"))))
 
 (defun edraw-widget-web-color--choose-action (widget &optional _event)

diff --git a/edraw.el b/edraw.el
@@ -1715,7 +1715,7 @@ document size or view box."
   (when (stringp fill)
     (when-let* ((color (edraw-color-picker-color-from-string
                         fill
-                        '((:color-name-scheme . web) (:enable-opacity . t)))))
+                        '((:color-syntax-system . css) (:enable-opacity . t)))))
       (>= (edraw-color-a color) 1))))
 
 (edraw-editor-defcmd edraw-set-background ((editor edraw-editor) fill)
@@ -1729,7 +1729,7 @@ document size or view box."
                   (edraw-msg "Background Color: ")
                   (or current-value "")
                   '("" "none")
-                  `((:color-name-scheme . web)
+                  `((:color-syntax-system . css)
                     (:no-color . "none")
                     (:on-input-change
                      . ,(lambda (string color)
@@ -4540,7 +4540,7 @@ position where the EVENT occurred."
                       (format "%s %s: " (car tag-value) prop-name)
                       (cdr tag-value)
                       '("" "none")
-                      `((:color-name-scheme . web)
+                      `((:color-syntax-system . css)
                         (:no-color . "none")
                         (:scale-direct . ,(oref editor image-scale))
                         (:palette-colors . ,(edraw-get-palette-colors editor))
@@ -6587,7 +6587,7 @@ This function is destructive: the list POINTS is modified."
                    (format "%s: " prop-name)
                    (or old-value "")
                    '("" "none")
-                   `((:color-name-scheme . web)
+                   `((:color-syntax-system . css)
                      (:no-color . "none")
                      (:on-input-change
                       . ,(lambda (string color)