Color Wheel: a press held on a harmony marker applies its color

A press on a harmony marker that is held past the length of a click
without leaving the marker no longer drags the hue ring under it: the
color stays as it was while the press is held, and releasing it on the
marker applies the marker's color, as a click does. A press that leaves
the marker still moves the ring's hue.

Harmony Rule in the panel menu is gray while the box shows, as Show
Harmony is. The catalog rows for Show Harmony, Harmony Rule and Harmony
color move next to the other Color Wheel rows.

Docs: docs/control-protocol.md lists the harmony and harmonyRule keys of
ui.colorWheel, and the Show Harmony sentence in
docs/target-app-parity.md moves to the Color Wheel panel entry.
This commit is contained in:
dotCooCoo
2026-11-14 09:00:30 -08:00
parent 605a9df93a
commit 9d6d9da79a
34 changed files with 169 additions and 110 deletions
+3 -3
View File
@@ -528,9 +528,6 @@ font-technology Variable Променливи
Color Group: Цветова група:
Color Group: {name} Цветова група: {name}
Color Guide Цветови водач
Show Harmony Показване на хармонията
Harmony Rule Правило за хармония
Harmony color Цвят от хармонията
Color Guide Options Опции на цветовия водач
Color Guide Options… Опции на цветовия водач…
Color images Цветни изображения
@@ -565,6 +562,9 @@ font-technology Variable Променливи
Box Channel Канал на квадрата
Color box Цветови квадрат
Color Wheel Options Опции на цветното колело
Show Harmony Показване на хармонията
Harmony Rule Правило за хармония
Harmony color Цвят от хармонията
Color Type: Цветен тип:
Color: Цвят:
Colorize Оцветяване
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -729,9 +729,6 @@
Brushes Četkice
Color Boja
Color Guide Vodič za boje
Show Harmony Prikaži harmoniju
Harmony Rule Pravilo harmonije
Harmony color Boja harmonije
Color Themes Teme boja
Color Wheel Kotač boja
Hue ring Prsten nijanse
@@ -743,6 +740,9 @@
Box Channel Kanal kvadrata
Color box Kvadrat boje
Color Wheel Options Opcije kotača boja
Show Harmony Prikaži harmoniju
Harmony Rule Pravilo harmonije
Harmony color Boja harmonije
CSS Properties CSS svojstva
Document Info Informacije o dokumentu
Flattener Preview Pregled spljoštavanja
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -786,9 +786,6 @@ antiAlias Sharp Nítid
Color Group: Grup de colors:
Color Group: {name} Grup de colors: {name}
Color Guide Guia de colors
Show Harmony Mostra l’harmonia
Harmony Rule Regla d’harmonia
Harmony color Color de l’harmonia
Color Guide Options Opcions de la guia de colors
Color Guide Options… Opcions de la guia de colors…
Color Halftone Semitons de color
@@ -827,6 +824,9 @@ antiAlias Sharp Nítid
Box Channel Canal del quadre
Color box Quadre de color
Color Wheel Options Opcions de la roda de colors
Show Harmony Mostra l’harmonia
Harmony Rule Regla d’harmonia
Harmony color Color de l’harmonia
Color Type: Tipus de color:
Color wheel Roda de color
Color: Color:
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -742,9 +742,6 @@
Brushes Štětce
Color Barva
Color Guide Průvodce barvami
Show Harmony Zobrazit harmonii
Harmony Rule Pravidlo harmonie
Harmony color Barva harmonie
Color Themes Barevné motivy
Color Wheel Barevné kolo
Hue ring Prstenec odstínů
@@ -756,6 +753,9 @@
Box Channel Kanál čtverce
Color box Barevný čtverec
Color Wheel Options Možnosti barevného kola
Show Harmony Zobrazit harmonii
Harmony Rule Pravidlo harmonie
Harmony color Barva harmonie
CSS Properties Vlastnosti CSS
Document Info Informace o dokumentu
Flattener Preview Náhled sloučení
Can't render this file because it is too large.
+3 -3
View File
@@ -687,9 +687,6 @@
Brushes Pensler
Color Farve
Color Guide Farveguide
Show Harmony Vis harmoni
Harmony Rule Harmoniregel
Harmony color Harmonifarve
Color Themes Farvetemaer
Color Wheel Farvehjul
Hue ring Ring for farvetone
@@ -701,6 +698,9 @@
Box Channel Kvadratets kanal
Color box Farvekvadrat
Color Wheel Options Indstillinger for farvehjul
Show Harmony Vis harmoni
Harmony Rule Harmoniregel
Harmony color Harmonifarve
CSS Properties CSS-egenskaber
Document Info Dokumentoplysninger
Flattener Preview Udjævningsforhåndsvisning
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -521,9 +521,6 @@ font-technology Variable Variabel
Color Group: Farbgruppe:
Color Group: {name} Farbgruppe: {name}
Color Guide Farbhilfe
Show Harmony Harmonie einblenden
Harmony Rule Harmonieregel
Harmony color Harmoniefarbe
Color Guide Options Farbhilfeoptionen
Color Guide Options… Farbhilfeoptionen…
Color images Farbbilder
@@ -558,6 +555,9 @@ font-technology Variable Variabel
Box Channel Kanal des Quadrats
Color box Farbquadrat
Color Wheel Options Optionen für den Farbkreis
Show Harmony Harmonie einblenden
Harmony Rule Harmonieregel
Harmony color Harmoniefarbe
Color Type: Farbart:
Color: Farbe:
Colorize Einfärben
Can't render this file because it is too large.
+3 -3
View File
@@ -503,9 +503,6 @@ font-technology Variable Μεταβλητές
Color Group: Ομάδα χρωμάτων:
Color Group: {name} Ομάδα χρωμάτων: {name}
Color Guide Οδηγός χρωμάτων
Show Harmony Εμφάνιση αρμονίας
Harmony Rule Κανόνας χρωματικής αρμονίας
Harmony color Χρώμα αρμονίας
Color Guide Options Επιλογές οδηγού χρωμάτων
Color Guide Options… Επιλογές οδηγού χρωμάτων…
Color images Έγχρωμες εικόνες
@@ -540,6 +537,9 @@ font-technology Variable Μεταβλητές
Box Channel Κανάλι τετραγώνου
Color box Τετράγωνο χρώματος
Color Wheel Options Επιλογές χρωματικού τροχού
Show Harmony Εμφάνιση αρμονίας
Harmony Rule Κανόνας χρωματικής αρμονίας
Harmony color Χρώμα αρμονίας
Color Type: Τύπος χρώματος:
Color: Χρώμα:
Colorize Χρωματισμός
Can't render this file because it is too large.
+3 -3
View File
@@ -543,9 +543,6 @@ font-technology Variable Variables
Color Group: Grupo de colores:
Color Group: {name} Grupo de colores: {name}
Color Guide Guía de color
Show Harmony Mostrar armonía
Harmony Rule Regla de armonía
Harmony color Color de la armonía
Color Guide Options Opciones de guía de color
Color Guide Options… Opciones de guía de color…
Color images Imágenes en color
@@ -580,6 +577,9 @@ font-technology Variable Variables
Box Channel Canal del cuadro
Color box Cuadro de color
Color Wheel Options Opciones de la rueda de color
Show Harmony Mostrar armonía
Harmony Rule Regla de armonía
Harmony color Color de la armonía
Color Type: Tipo de color:
Color: Color:
Colorize Colorear
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -733,9 +733,6 @@
Brushes Siveltimet
Color Väri
Color Guide Väriopas
Show Harmony Näytä harmonia
Harmony Rule Harmoniasääntö
Harmony color Harmonian väri
Color Themes Väriteemat
Color Wheel Väriympyrä
Hue ring Sävyrengas
@@ -747,6 +744,9 @@
Box Channel Ruudun kanava
Color box Väriruutu
Color Wheel Options Väriympyrän asetukset
Show Harmony Näytä harmonia
Harmony Rule Harmoniasääntö
Harmony color Harmonian väri
CSS Properties CSS-ominaisuudet
Document Info Asiakirjan tiedot
Flattener Preview Litistyksen esikatselu
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -544,9 +544,6 @@ font-technology Variable Variables
Color Group: Groupe de couleurs :
Color Group: {name} Groupe de couleurs : {name}
Color Guide Guide des couleurs
Show Harmony Afficher l’harmonie
Harmony Rule Règle d’harmonie
Harmony color Couleur de l’harmonie
Color Guide Options Options du guide des couleurs
Color Guide Options… Options du guide des couleurs…
Color images Images couleur
@@ -581,6 +578,9 @@ font-technology Variable Variables
Box Channel Couche du carré
Color box Carré de couleur
Color Wheel Options Options de la roue chromatique
Show Harmony Afficher l’harmonie
Harmony Rule Règle d’harmonie
Harmony color Couleur de l’harmonie
Color Type: Type de couleur :
Color: Couleur :
Colorize Coloriser
Can't render this file because it is too large.
+3 -3
View File
@@ -619,9 +619,6 @@
Color Group: રંગ ગ્રૂપ:
Color Group: {name} રંગ ગ્રૂપ: {name}
Color Guide રંગ ગાઇડ
Show Harmony હાર્મની બતાવો
Harmony Rule હાર્મની નિયમ
Harmony color હાર્મની રંગ
Color Guide Options રંગ ગાઇડ વિકલ્પો
Color Guide Options… રંગ ગાઇડ વિકલ્પો…
Color Halftone… કલર હાફટોન…
@@ -4232,6 +4229,9 @@
Box Channel બૉક્સ ચેનલ
Color box રંગ બૉક્સ
Color Wheel Options રંગ વ્હીલ વિકલ્પો
Show Harmony હાર્મની બતાવો
Harmony Rule હાર્મની નિયમ
Harmony color હાર્મની રંગ
{name} (spot) {name} (સ્પૉટ)
{pages} in all, {count} per copy કુલ {pages}, પ્રતિ નકલ {count}
{page} of {count} {count} માંથી {page}
Can't render this file because it contains an unexpected character in line 72 and column 5.
+3 -3
View File
@@ -910,9 +910,6 @@ antiAlias Sharp शार्प
Color Group: रंग समूह:
Color Group: {name} रंग समूह: {name}
Color Guide रंग गाइड
Show Harmony सद्भाव दिखाएँ
Harmony Rule सद्भाव नियम
Harmony color सद्भाव रंग
Color Guide Options रंग गाइड ऑप्शन्स
Color Guide Options… रंग गाइड ऑप्शन्स…
Color Halftone कलर हाफ़टोन
@@ -951,6 +948,9 @@ antiAlias Sharp शार्प
Box Channel बॉक्स चैनल
Color box कलर बॉक्स
Color Wheel Options कलर व्हील ऑप्शन्स
Show Harmony सद्भाव दिखाएँ
Harmony Rule सद्भाव नियम
Harmony color सद्भाव रंग
Color Type: रंग का प्रकार:
Color wheel कलर व्हील
Color: रंग:
Can't render this file because it is too large.
+3 -3
View File
@@ -716,9 +716,6 @@ font-technology Variable Változó
Color Group: Színcsoport:
Color Group: {name} Színcsoport: {name}
Color Guide Színkalauz
Show Harmony Harmónia megjelenítése
Harmony Rule Harmóniaszabály
Harmony color Harmóniaszín
Color Guide Options Színkalauz beállításai
Color Guide Options… Színkalauz beállításai…
Color Halftone Színes rácspontos raszter
@@ -756,6 +753,9 @@ font-technology Variable Változó
Box Channel Négyzet csatornája
Color box Színnégyzet
Color Wheel Options Színkör beállításai
Show Harmony Harmónia megjelenítése
Harmony Rule Harmóniaszabály
Harmony color Harmóniaszín
Color Type: Színtípus:
Color: Szín:
Colorization Színezés
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -687,9 +687,6 @@
Brushes Kuas
Color Warna
Color Guide Panduan warna
Show Harmony Tampilkan harmoni
Harmony Rule Aturan harmoni
Harmony color Warna harmoni
Color Themes Tema warna
Color Wheel Roda warna
Hue ring Cincin rona
@@ -701,6 +698,9 @@
Box Channel Saluran kotak
Color box Kotak warna
Color Wheel Options Opsi roda warna
Show Harmony Tampilkan harmoni
Harmony Rule Aturan harmoni
Harmony color Warna harmoni
CSS Properties Properti CSS
Document Info Info dokumen
Flattener Preview Pratinjau perata
1 # Indonesian (id) catalog. Same format as zh-hant.tsv: context <TAB> source <TAB> translation
687
688
689
690
691
692
698
699
700
701
702
703
704
705
706
+3 -3
View File
@@ -543,9 +543,6 @@ font-technology Variable Variabili
Color Group: Gruppo colori:
Color Group: {name} Gruppo colori: {name}
Color Guide Guida colori
Show Harmony Mostra armonia
Harmony Rule Regola di armonia
Harmony color Colore dell’armonia
Color Guide Options Opzioni guida colori
Color Guide Options… Opzioni guida colori…
Color images Immagini a colori
@@ -580,6 +577,9 @@ font-technology Variable Variabili
Box Channel Canale del riquadro
Color box Riquadro colore
Color Wheel Options Opzioni ruota dei colori
Show Harmony Mostra armonia
Harmony Rule Regola di armonia
Harmony color Colore dell’armonia
Color Type: Tipo di colore:
Color: Colore:
Colorize Colora
Can't render this file because it is too large.
+3 -3
View File
@@ -757,9 +757,6 @@ digits Malayalam マラヤーラム数字
Brushes ブラシ
Color カラー
Color Guide カラーガイド
Show Harmony ハーモニーを表示
Harmony Rule ハーモニールール
Harmony color ハーモニーカラー
Color Themes カラーテーマ
Color Wheel カラーホイール
Hue ring 色相リング
@@ -771,6 +768,9 @@ digits Malayalam マラヤーラム数字
Box Channel ボックスのチャンネル
Color box カラーボックス
Color Wheel Options カラーホイールオプション
Show Harmony ハーモニーを表示
Harmony Rule ハーモニールール
Harmony color ハーモニーカラー
CSS Properties CSS プロパティ
Document Info ドキュメント情報
Flattener Preview 分割・統合プレビュー
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -653,9 +653,6 @@
Brushes ფუნჯები
Color ფერი
Color Guide ფერის გზამკვლევი
Show Harmony ჰარმონიის ჩვენება
Harmony Rule ჰარმონიის წესი
Harmony color ჰარმონიის ფერი
Color Themes ფერის თემები
Color Wheel ფერთა წრე
Hue ring ფერის ტონის რგოლი
@@ -667,6 +664,9 @@
Box Channel კვადრატის არხი
Color box ფერის კვადრატი
Color Wheel Options ფერთა წრის პარამეტრები
Show Harmony ჰარმონიის ჩვენება
Harmony Rule ჰარმონიის წესი
Harmony color ჰარმონიის ფერი
CSS Properties CSS თვისებები
Document Info დოკუმენტის ინფორმაცია
Flattener Preview გაბრტყელების წინასწარი ნახვა
Can't render this file because it is too large.
+3 -3
View File
@@ -750,9 +750,6 @@ digits Malayalam 말라얄람어
Brushes 브러시
Color 색상
Color Guide 색상 가이드
Show Harmony 하모니 표시
Harmony Rule 하모니 규칙
Harmony color 하모니 색상
Color Themes 색상 테마
Color Wheel 색상환
Hue ring 색조 링
@@ -764,6 +761,9 @@ digits Malayalam 말라얄람어
Box Channel 상자 채널
Color box 색상 상자
Color Wheel Options 색상환 옵션
Show Harmony 하모니 표시
Harmony Rule 하모니 규칙
Harmony color 하모니 색상
CSS Properties CSS 속성
Document Info 문서 정보
Flattener Preview 병합 미리 보기
Can't render this file because it is too large.
+3 -3
View File
@@ -1205,9 +1205,6 @@
Brushes Penseel
Color Kleur
Color Guide Kleurhulp
Show Harmony Harmonie tonen
Harmony Rule Harmonieregel
Harmony color Harmoniekleur
Color Themes Kleurthema's
Color Wheel Kleurenwiel
Hue ring Tintring
@@ -1219,6 +1216,9 @@
Box Channel Kanaal van het vak
Color box Kleurvak
Color Wheel Options Opties voor kleurenwiel
Show Harmony Harmonie tonen
Harmony Rule Harmonieregel
Harmony color Harmoniekleur
CSS Properties CSS-eigenschappen
Document Info Documentinfo
Flattener Preview Afvlakvoorbeeld
Can't render this file because it contains an unexpected character in line 2 and column 73.
+3 -3
View File
@@ -691,9 +691,6 @@
Brushes Pędzle
Color Kolor
Color Guide Przewodnik kolorów
Show Harmony Pokaż harmonię
Harmony Rule Reguła harmonii
Harmony color Kolor harmonii
Color Themes Motywy kolorów
Color Wheel Koło kolorów
Hue ring Pierścień barwy
@@ -705,6 +702,9 @@
Box Channel Kanał kwadratu
Color box Kwadrat koloru
Color Wheel Options Opcje koła kolorów
Show Harmony Pokaż harmonię
Harmony Rule Reguła harmonii
Harmony color Kolor harmonii
CSS Properties Właściwości CSS
Document Info Informacje o dokumencie
Flattener Preview Podgląd spłaszczania
Can't render this file because it is too large.
+3 -3
View File
@@ -495,9 +495,6 @@ antiAlias Sharp Nítido
Color Group: Grupo de Cores:
Color Group: {name} Grupo de Cores: {name}
Color Guide Guia de Cores
Show Harmony Mostrar Harmonia
Harmony Rule Regra de Harmonia
Harmony color Cor da harmonia
Color Guide Options Opções do Guia de Cores
Color Guide Options… Opções do Guia de Cores…
Color Library… Biblioteca de Cores…
@@ -525,6 +522,9 @@ antiAlias Sharp Nítido
Box Channel Canal da Caixa
Color box Caixa de cor
Color Wheel Options Opções da Roda de Cores
Show Harmony Mostrar Harmonia
Harmony Rule Regra de Harmonia
Harmony color Cor da harmonia
Color Type: Tipo de Cor:
Color blindness – Deuteranopia-type Daltonismo – tipo deuteranopia
Color blindness – Protanopia-type Daltonismo – tipo protanopia
Can't render this file because it is too large.
+3 -3
View File
@@ -541,9 +541,6 @@ font-technology Variable Вариативные
Color Group: Цветовая группа:
Color Group: {name} Цветовая группа: {name}
Color Guide Цветовой гид
Show Harmony Показать гармонию
Harmony Rule Правило гармонии
Harmony color Цвет гармонии
Color Guide Options Параметры цветового гида
Color Guide Options… Параметры цветового гида…
Color images Цветные изображения
@@ -578,6 +575,9 @@ font-technology Variable Вариативные
Box Channel Канал квадрата
Color box Цветовой квадрат
Color Wheel Options Параметры цветового круга
Show Harmony Показать гармонию
Harmony Rule Правило гармонии
Harmony color Цвет гармонии
Color Type: Тип цвета:
Color: Цвет:
Colorize Тонировать
Can't render this file because it is too large.
+3 -3
View File
@@ -530,9 +530,6 @@ font-technology Variable Variabla
Color Group: Färggrupp:
Color Group: {name} Färggrupp: {name}
Color Guide Färgguide
Show Harmony Visa harmoni
Harmony Rule Harmoniregel
Harmony color Harmonifärg
Color Guide Options Alternativ för färgguide
Color Guide Options… Alternativ för färgguide…
Color images Färgbilder
@@ -567,6 +564,9 @@ font-technology Variable Variabla
Box Channel Rutans kanal
Color box Färgruta
Color Wheel Options Alternativ för färghjulet
Show Harmony Visa harmoni
Harmony Rule Harmoniregel
Harmony color Harmonifärg
Color Type: Färgtyp:
Color: Färg:
Colorize Färglägg
Can't render this file because it is too large.
+3 -3
View File
@@ -525,9 +525,6 @@ font-technology Variable Değişken
Color Group: Renk Grubu:
Color Group: {name} Renk Grubu: {name}
Color Guide Renk Kılavuzu
Show Harmony Uyumu Göster
Harmony Rule Uyum Kuralı
Harmony color Uyum rengi
Color Guide Options Renk Kılavuzu Seçenekleri
Color Guide Options… Renk Kılavuzu Seçenekleri…
Color images Renkli görseller
@@ -561,6 +558,9 @@ font-technology Variable Değişken
Box Channel Kutu Kanalı
Color box Renk kutusu
Color Wheel Options Renk Tekerleği Seçenekleri
Show Harmony Uyumu Göster
Harmony Rule Uyum Kuralı
Harmony color Uyum rengi
Color Type: Renk Türü:
Color: Renk:
Colorize Renklendir
Can't render this file because it contains an unexpected character in line 5 and column 25.
+3 -3
View File
@@ -537,9 +537,6 @@ font-technology Variable Варіативні
Color Group: Колірна група:
Color Group: {name} Колірна група: {name}
Color Guide Колірний гід
Show Harmony Показати гармонію
Harmony Rule Правило гармонії
Harmony color Колір гармонії
Color Guide Options Параметри колірного гіда
Color Guide Options… Параметри колірного гіда…
Color images Кольорові зображення
@@ -574,6 +571,9 @@ font-technology Variable Варіативні
Box Channel Канал квадрата
Color box Колірний квадрат
Color Wheel Options Параметри колірного кола
Show Harmony Показати гармонію
Harmony Rule Правило гармонії
Harmony color Колір гармонії
Color Type: Тип кольору:
Color: Колір:
Colorize Тонувати
Can't render this file because it is too large.
+3 -3
View File
@@ -628,9 +628,6 @@ font-technology Variable Biến thiên
Color Group: Nhóm màu:
Color Group: {name} Nhóm màu: {name}
Color Guide Hướng dẫn màu
Show Harmony Hiện hài hòa màu
Harmony Rule Quy tắc hài hòa màu
Harmony color Màu hài hòa
Color Guide Options Tùy chọn hướng dẫn màu
Color Guide Options… Tùy chọn hướng dẫn màu…
Color Halftone Màu nửa tông
@@ -667,6 +664,9 @@ font-technology Variable Biến thiên
Box Channel Kênh của hộp
Color box Hộp màu
Color Wheel Options Tùy chọn bánh xe màu
Show Harmony Hiện hài hòa màu
Harmony Rule Quy tắc hài hòa màu
Harmony color Màu hài hòa
Color Type: Loại màu:
Color: Màu:
Colorization Tô màu
Can't render this file because it contains an unexpected character in line 204 and column 5.
+3 -3
View File
@@ -489,9 +489,6 @@ antiAlias Sharp 锐利
Color Group: 颜色组:
Color Group: {name} 颜色组:{name}
Color Guide 颜色参考
Show Harmony 显示协调
Harmony Rule 协调规则
Harmony color 协调颜色
Color Guide Options 颜色参考选项
Color Guide Options… 颜色参考选项…
Color images 彩色图像
@@ -526,6 +523,9 @@ antiAlias Sharp 锐利
Box Channel 方块色版
Color box 颜色方块
Color Wheel Options 色轮选项
Show Harmony 显示协调
Harmony Rule 协调规则
Harmony color 协调颜色
Color Type: 颜色类型:
Color: 颜色:
Colorize 上色
Can't render this file because it is too large.
+3 -3
View File
@@ -506,9 +506,6 @@ font-technology Variable 可變
Color Group: 顏色群組:
Color Group: {name} 顏色群組:{name}
Color Guide 色彩參考
Show Harmony 顯示色彩調和
Harmony Rule 色彩調和規則
Harmony color 調和色彩
Color Guide Options 色彩參考選項
Color Guide Options… 色彩參考選項…
Color images 彩色影像
@@ -543,6 +540,9 @@ font-technology Variable 可變
Box Channel 方塊色版
Color box 顏色方塊
Color Wheel Options 色輪選項
Show Harmony 顯示色彩調和
Harmony Rule 色彩調和規則
Harmony color 調和色彩
Color Type: 顏色類型:
Color: 顏色:
Colorize 上色
Can't render this file because it is too large.
+20 -11
View File
@@ -177,7 +177,7 @@ pub(crate) fn command(app: &mut VectorcraftApp, p: &Value) -> Result<Value, Stri
}
/// The panel menu: Wheel View and Box View, and Box Channel while the box shows; Show Harmony
/// while the wheel shows, and Harmony Rule.
/// and Harmony Rule while the wheel shows.
pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
let set = app.ui.color_wheel.clone();
for (label, view) in [(tl!("Wheel View"), View::Wheel), (tl!("Box View"), View::Box)] {
@@ -198,12 +198,14 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
if menu_item(ui, tl!("Show Harmony"), set.view == View::Wheel, set.harmony) {
command(app, &json!({ "harmony": !set.harmony })).ok();
}
ui.menu_button(format!(" {}", tl!("Harmony Rule")), |ui| {
for rule in harmony_rules() {
if menu_item(ui, rule.label(), true, rule == set.harmony_rule) {
command(app, &json!({ "harmonyRule": rule.id() })).ok();
ui.add_enabled_ui(set.view == View::Wheel, |ui| {
ui.menu_button(format!(" {}", tl!("Harmony Rule")), |ui| {
for rule in harmony_rules() {
if menu_item(ui, rule.label(), true, rule == set.harmony_rule) {
command(app, &json!({ "harmonyRule": rule.id() })).ok();
}
}
}
});
});
}
@@ -400,19 +402,26 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
let at = |x: f32, y: f32| widgets::hsb32([hsb[0], x, 1.0 - y]);
let name = tl!("Saturation and brightness");
let (field, field_phase) = widgets::color_field(&mut field_ui, "field", (name, axes), square.size(), (hsb[1], 1.0 - hsb[2]), marked, &at);
if let Some((h, phase)) = ring.hue {
pick = Some(([h, hsb[1], hsb[2]], phase));
}
// Show Harmony: the rule's other colors for the current one, which follow it.
// Show Harmony: the rule's other colors for the current one, which follow it. While a press
// is held on a marker, the ring's drag under it picks nothing.
let set = &app.ui.color_wheel;
let mut held = false;
if set.harmony && marked {
let others: Vec<[f32; 3]> = set.harmony_rule.apply_hsb(hsb).into_iter().skip(1).collect();
if let Some(i) = widgets::ring_markers(ui, "color-wheel-harmony", ring.rect, &others, tl!("Harmony color"))
let markers = widgets::ring_markers(ui, "color-wheel-harmony", ring.rect, &others, tl!("Harmony color"));
held = markers.held;
if let Some(i) = markers.picked
&& let Some(&c) = others.get(i)
{
pick = Some((c, Live::Released));
}
}
if let Some((h, phase)) = ring.hue
&& !held
&& pick.is_none()
{
pick = Some(([h, hsb[1], hsb[2]], phase));
}
// A press between the square and the ring picks the closest point of the square, which
// takes the keyboard focus.
if let Some((p, phase)) = ring.inner {
@@ -158,6 +158,26 @@ fn a_drag_from_a_marker_moves_the_hue() {
assert_eq!(undo_len(h.state()), undo + 1);
}
/// A press held on a High Contrast marker past the length of a click, without moving, applies the
/// rule's color on release, and the hue under the pointer is not previewed while it is held.
#[test]
fn a_press_held_on_a_marker_applies_the_rules_color() {
let mut h = harness(app(json!([0.9, 0.8, 0.2]), "highContrast"));
let base = hsb(&fill(h.state()));
let at = markers(&h);
assert_eq!(at.len(), 1);
let undo = undo_len(h.state());
press(&mut h, at[0], true, Modifiers::NONE);
h.run_steps(6);
assert_eq!(hsb(&fill(h.state())), base, "nothing changes while the press is held");
press(&mut h, at[0], false, Modifiers::NONE);
h.run_steps(1);
let want = Harmony::HighContrast.apply_hsb(base)[1];
let got = hsb(&fill(h.state()));
assert!((got[2] - want[2]).abs() < 0.01 && (got[0] - want[0]).abs() < 1.0, "{got:?} {want:?}");
assert_eq!(undo_len(h.state()), undo + 1);
}
/// Alt-click on a marker paints the stroke, and the fill stays in front.
#[test]
fn alt_click_on_a_marker_paints_the_stroke() {
@@ -327,4 +347,5 @@ fn the_panel_menu_shows_the_harmony_and_picks_the_rule() {
h.state_mut().run("ui.colorWheel", json!({"view": "box"})).unwrap();
h.run_steps(2);
assert!(h.get_by_label("✓ Show Harmony").accesskit_node().data().is_disabled(), "gray while the box shows");
assert!(h.get_by_label(" Harmony Rule").accesskit_node().data().is_disabled(), "gray while the box shows");
}
+3 -3
View File
@@ -35,9 +35,9 @@ pub(crate) use buttons::{button_width, icon_button_info, primary_button_width, s
use chips::gradient_chip_colors;
pub use chips::{ProxyClicks, chip_button, chip_button_named, fill_stroke_proxy, gradient_chip, paint_chip, proxy_chip, swatch_tile};
pub use color::{
FieldAxis, Live, RingResponse, SliderValue, WheelResponse, channel_slider, channel_slider_named, channel_slider_stepped, channel_slider_valued,
color_field, color_mesh, color_slider, color_slider_named, color_slider_stepped, color_slider_valued, harmony_wheel, hex_field, hex_field_named,
hsb32, hue_ring, region_texture, ring_markers, ring_square, segment_color, segmented_wheel, stepped_area,
FieldAxis, Live, MarkerResponse, RingResponse, SliderValue, WheelResponse, channel_slider, channel_slider_named, channel_slider_stepped,
channel_slider_valued, color_field, color_mesh, color_slider, color_slider_named, color_slider_stepped, color_slider_valued, harmony_wheel,
hex_field, hex_field_named, hsb32, hue_ring, region_texture, ring_markers, ring_square, segment_color, segmented_wheel, stepped_area,
};
pub(crate) use color::{HEX_FIELD_CHARS, hex_text, pointer_phase};
pub use drag::{
+35 -7
View File
@@ -917,22 +917,45 @@ pub fn hue_ring(ui: &mut Ui, id: impl std::hash::Hash, name: &str, size: f32, hu
out
}
/// What [`ring_markers`] did this frame.
#[derive(Clone, Copy, Debug, Default)]
pub struct MarkerResponse {
/// The index of the marker that was picked.
pub picked: Option<usize>,
/// A press on a marker is held with the pointer still on the marker. The caller then ignores
/// the drag that the ring under it reports.
pub held: bool,
}
/// Markers on a [`hue_ring`] drawn in `rect`, one for each HSB of `colors` at its hue, filled with
/// its color and smaller than the ring's own marker. Each marker is a button that screen readers
/// read as `name` with the color's hex value. A click gives it the keyboard focus, and a click,
/// Enter or Space on the focused marker, or a screen reader's click returns its index. A drag that
/// starts on a marker moves the ring's hue as a drag on the band does.
pub fn ring_markers(ui: &mut Ui, id: &str, rect: Rect, colors: &[[f32; 3]], name: &str) -> Option<usize> {
/// read as `name` with the color's hex value. A click gives it the keyboard focus. A click, a
/// press released on the marker however long it was held, Enter or Space on the focused marker,
/// or a screen reader's click picks it. A drag that leaves the marker moves the ring's hue as a
/// drag on the band does.
pub fn ring_markers(ui: &mut Ui, id: &str, rect: Rect, colors: &[[f32; 3]], name: &str) -> MarkerResponse {
let t = Tokens::get(ui.ctx());
let c = rect.center();
let mid = rect.width().min(rect.height()) / 2.0 - RING_MARGIN - RING_WIDTH / 2.0;
let radius = RING_WIDTH / 2.0 - 2.0;
let painter = ui.painter_at(rect);
let press_id = id_with(ui.scope_id(), (id, "press"));
let (pos, down, pressed, released) =
ui.input(|i| (i.pointer.latest_pos(), i.pointer.primary_down(), i.pointer.primary_pressed(), i.pointer.primary_released()));
let mut held_on: Option<usize> = ui.data(|d| d.get_temp(press_id)).flatten();
let mut picked = None;
for (i, hsb) in colors.iter().enumerate() {
let p = wheel_pos(c, mid, hsb[0], 1.0);
let resp = ui.interact(Rect::from_center_size(p, Vec2::splat(RING_WIDTH)), id_with(ui.scope_id(), (id, i)), Sense::click());
let area = Rect::from_center_size(p, Vec2::splat(RING_WIDTH));
let resp = ui.interact(area, id_with(ui.scope_id(), (id, i)), Sense::click());
focus_on_press(&resp);
if pressed && resp.is_pointer_button_down_on() {
held_on = Some(i);
}
let on = pos.is_some_and(|p| area.contains(p));
if held_on == Some(i) && !on {
held_on = None;
}
let fill = hsb32(*hsb);
painter.circle(p, radius, fill, Stroke::new(1.0, Color32::WHITE));
painter.circle_stroke(p, radius + 1.0, Stroke::new(1.0, Color32::BLACK));
@@ -944,11 +967,16 @@ pub fn ring_markers(ui: &mut Ui, id: &str, rect: Rect, colors: &[[f32; 3]], name
current_text_value: Some(hex.clone()),
..egui::WidgetInfo::labeled(egui::Role::Button, ui.is_enabled(), name)
});
if resp.clicked() {
if resp.clicked() || (held_on == Some(i) && released && on) {
picked = Some(i);
}
}
picked
if held_on.is_some_and(|i| i >= colors.len()) {
held_on = None;
}
let held = down && held_on.is_some();
ui.data_mut(|d| d.insert_temp(press_id, if down { held_on } else { None }));
MarkerResponse { picked, held }
}
/// Hue sectors and saturation rings of the [`segmented_wheel`]: patches 15° of hue by 20%
+4 -3
View File
@@ -265,9 +265,10 @@ My Themes tab lists the saved themes; every action runs a command (`colorTheme.s
Color Wheel panel (`window.panel {panel: "colorWheel"}`): a hue ring around a saturation and brightness square. A
pick runs the commands the Color panel's sliders run: `paint.setFill` or `paint.setStroke` with `keepModel`,
`paint.editGradient` for a gradient's selected stop, and `paint.freeform.setPoint` for a freeform gradient's selected
point (the first stop or point when none is selected). `ui.colorWheel {view?, channel?}` shows the wheel or the box (a
color field with a channel strip at its right) and picks the box's channel; it returns the settings, and `ui.inspect`
reports them as `ui.color_wheel`.
point (the first stop or point when none is selected). `ui.colorWheel {view?, channel?, harmony?, harmonyRule?}` shows the wheel or the
box (a color field with a channel strip at its right), picks the box's channel, and shows the other colors of a
harmony rule as markers on the wheel's ring; it returns the settings, and `ui.inspect` reports them as
`ui.color_wheel`.
Edit Colors dialogs: `ui.colorBalanceDialog` opens Adjust Colors (`colorBalance`: fields `mode` `gray`/`rgb`/`cmyk`/
`global`, the channels `r` `g` `b` / `c` `m` `y` `k` / `gray` / `tint` (global mode) from −100 to 100, `convert`, `fill`, `stroke`,
+2 -2
View File
@@ -1502,7 +1502,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
- **Colorized images (#1466):** a fill color applied to a selected grayscale or 1-bit image (`paint.setFill`) colorizes it with black, white, a process color or a spot color, and refuses a process color when the image has an alpha channel ([Convert color modes](https://web.archive.org/web/20251220223850/https://helpx.adobe.com/illustrator/desktop/manage-colors/select-and-adjust-colors/convert-color-modes.html), "Colorize Grayscale or 1-bit images"); black and white are accepted there too. The canvas draws each pixel in the color as far as the pixel is dark, with white pixels transparent; PDF export writes the image in the color (a spot color as its ink, Registration in every ink) with the image as its soft mask; Separations Preview and printed separations show it on its color's plates; native files keep the color. EPS and SVG write the image's own pixels.
- **Missing library files:** a persistent swatch or graphic style library panel whose file is gone at startup reopens and stays in the preferences, showing the file's path with Locate Library… (`ui.libraryPanel.locate`), which reads the file from where it is now into the same panel.
- **Swatch library and Recolor Artwork parameters:** the `swatch.library.*` commands, `swatch.resetDefaults`, the graphic style library save, load and add, the `recolor.*` commands and `color.harmony`'s `limitTo` refuse parameters of the wrong form, such as `names: "Grays"`, `limitTo: 5` or `includeImages: "false"`. Errors name the parameter, except that a `limitTo` that is not a string, such as `5`, gets an unknown-library error. A `null` counts as left out except for `recolor.apply`'s `model`, which must be a string when given.
- **Color Wheel panel (part of #978):** Window › Color Wheel shows the Fill and Stroke proxy beside a hue ring around a square with saturation across and brightness up. It edits what the Color panel's sliders edit (the active proxy's color, the selected gradient stop or freeform point) through the same paint commands, and a drag is one undo step. Alt paints the other proxy, and Shift steps the ring by 45°. A pick goes from display sRGB into the working RGB space; an RGB, CMYK or Lab color keeps its model, and a Gray color or a tint of a global swatch becomes a process color in the document's color mode. A click gives the ring or the square the keyboard focus, and the arrow keys then step the color; both report their names and values to screen readers, and the Color Picker's color field takes the same keys. The panel menu's Box View puts a box in the wheel's place: a color field with a channel strip at its right for Hue, Saturation, Brightness, Red, Green or Blue (Box Channel), on the Color Picker's axes, kept with the preferences (`ui.colorWheel`); the strip and the Color Picker's channel slider take the arrow keys after a click. Scores and estimates are unchanged.
- **Color Wheel panel (part of #978):** Window › Color Wheel shows the Fill and Stroke proxy beside a hue ring around a square with saturation across and brightness up. It edits what the Color panel's sliders edit (the active proxy's color, the selected gradient stop or freeform point) through the same paint commands, and a drag is one undo step. Alt paints the other proxy, and Shift steps the ring by 45°. A pick goes from display sRGB into the working RGB space; an RGB, CMYK or Lab color keeps its model, and a Gray color or a tint of a global swatch becomes a process color in the document's color mode. A click gives the ring or the square the keyboard focus, and the arrow keys then step the color; both report their names and values to screen readers, and the Color Picker's color field takes the same keys. The panel menu's Box View puts a box in the wheel's place: a color field with a channel strip at its right for Hue, Saturation, Brightness, Red, Green or Blue (Box Channel), on the Color Picker's axes, kept with the preferences (`ui.colorWheel`); the strip and the Color Picker's channel slider take the arrow keys after a click. The panel menu's Show Harmony marks the other colors of a harmony rule (Harmony Rule) on the ring; the markers follow the current color, and a click on a marker applies its color (`ui.colorWheel {harmony, harmonyRule}`). Scores and estimates are unchanged.
- **Colour:** a Color Picker (colour field, H/S/B/R/G/B channel slider, HSB/RGB/Lab/CMYK fields, hex, web-only snapping, out-of-gamut correction); the Color panel shows a selected colour in its own model and, with nothing selected, the new-art defaults in the mode picked last, which it keeps between sessions; Alt-click paints the other proxy; proxies look through groups and show "?" for mixed paint; Invert, Complement, Apply Last Color (`,`) and Apply Last Gradient (`.`) keep the colour model; every paint command feeds the recent colours. The Color Guide has 21 harmony rules, Steps and Variation options and Limit to Library. Adjust Color Balance (its Global mode shifts tints) and Saturate preview live; Edit Colors and Recolor also reach meshes, images and patterns. Recolor Artwork has colour reduction, five recolour methods, presets, Limit to Library, a colour-wheel Edit tab and Edit Color Group; a local Color Themes panel saves five-colour themes. Fill/Stroke chips open swatch and mixer popovers (the Properties panel has the Control bar's Fill and Stroke chips, Stroke link and weight spinner, with nothing selected too), panels have Illustrator's Window menu keys (Align Shift+F7, Transform Shift+F8, Pathfinder Cmd+Shift+F9, Layers F7, Character Cmd+T…; every panel can be given one in Edit › Keyboard Shortcuts), and Eyedropper Options pick up and apply chosen attributes (Alt and Shift+Alt, image pixels). An ICC CMYK profile converts straight into the RGB working space (not through sRGB, so a wider space such as Wide Gamut RGB keeps colours sRGB can't hold) with the colour settings' black-point compensation, on the canvas and in RGB exports alike (the built-in Generic CMYK compensates both ways, so RGB black separated to a rich black displays as black again). Fills and strokes can overprint (Attributes panel, Overprint Black options), and CMYK documents blend in inks on screen, in PDF and when flattening. Document Color Mode converts the art, symbols, pattern tiles and swatches through the colour settings: Gray stays Gray, RGB grays separate into light grays in cyan, magenta and yellow only, darker four-color grays and a rich black, or go on the black plate only with `grays: "black"` (also for `document.open {colorMode}`).
Plain Comma and Period, and also Shift+Comma and Shift+Period, apply the last solid color and the last gradient to the active Fill or Stroke proxy in VectorCraft ([Default keyboard shortcuts](https://web.archive.org/web/20260726060015/https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html), "Select color fill mode" and "Select gradient fill mode").
Recent Colors keeps the last 30 solid colors applied, newest first and each once, and the list stays the same when another document is opened or made active; a 31st color drops the oldest ([Select colors using the Color panel](https://helpx.adobe.com/illustrator/desktop/manage-colors/select-and-adjust-colors/select-colors-using-the-color-panel.html)). The list lasts for the session. In the Color and Swatches panels the chips wrap onto further rows when the panel is too narrow for one row (`paint.recent`). Tests: `recent_colors_keep_thirty_colors_across_documents` in `crates/engine/src/tests/paintproxy.rs`, `all_thirty_recent_colors_wrap_into_a_narrow_panel` in `crates/ui-egui/src/panels/color/tests.rs`.
@@ -1596,7 +1596,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
- **Load text styles from another document:** the Character Styles and Paragraph Styles panel menus have Load Character Styles… or Load Paragraph Styles… and Load All Styles…, which copy the styles of a document picked in an open dialog, with the swatches and patterns they paint with, in one undo step (`charStyle.load`, `paraStyle.load`, `textStyle.loadAll`); a style the document already has, under its name or a numbered one, is not added again, any other whose name is taken gets a number, and the file's Normal styles are not loaded. Public reference: [Character and paragraph styles](https://web.archive.org/web/20261015081534/https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
- **Pasted text styles and their patterns:** Paste, and the symbol, brush, pattern and Libraries imports that add art the same way, place each text style, symbol, pattern and brush after the ones it uses. A character style that paints with a pattern added under a free name ("Dots 2") paints with "Dots 2", and it is not matched to a document style of its name that paints with the document's own "Dots"; it gets a number instead ("Patterned 2"). A symbol whose art paints with such a pattern, and a brush whose art sets type in a renamed style, are added as numbered copies in the same way. Pasting again uses the numbered copies. The help page says pasted art brings the swatches it uses ([help guide, p. 134](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf)); the order and the matching are VectorCraft's own rules. Tests: `pasted_styles_paint_with_the_renamed_pattern_they_use`, `pasted_styles_are_not_matched_to_styles_that_paint_with_another_pattern`, `a_pasted_style_and_the_pattern_whose_tile_uses_it_come_in_together`, `pasted_symbols_are_not_matched_to_symbols_that_paint_with_another_pattern` and `pasted_brushes_are_not_matched_to_brushes_that_use_another_style` in `crates/engine/src/tests/clipboard.rs`.
- **Neutral wording:** labels, MCP tool text, docs and packaging use neutral names, and `cargo xtask brands` (part of `cargo xtask ci`) fails on vendor names.
- **Colour, type and file workflows:** Recolor Artwork (dialog with harmonies), Edit Colors, Find & Replace, Change Case, Smart Punctuation, Guides, Lock/Hide Above, Transform Each, Rasterize. The Color Wheel panel's Show Harmony marks the other colors of a harmony rule on the ring, which follow the current color, and a click on a marker applies its color (`ui.colorWheel {harmony, harmonyRule}`).
- **Colour, type and file workflows:** Recolor Artwork (dialog with harmonies), Edit Colors, Find & Replace, Change Case, Smart Punctuation, Guides, Lock/Hide Above, Transform Each, Rasterize.
The Libraries panel holds gradients and patterns: its + button adds the selection's fill or stroke gradient or pattern, a gradient or pattern swatch dragged from the Swatches panel is added, and a click paints the selection through the active Fill/Stroke proxy, a pattern bringing its definition and swatch into the document. A spot colour stays a spot colour: the library keeps its ink name and tint, and using it in any document links the paint to that document's spot swatch of that name, adding it when missing (#5812).
A right-click on a character style in the Libraries panel offers Apply Character Style, Add to Character Styles, Move to Group, Rename… and Delete ([help page](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/add-and-use-text-and-character-styles-in-libraries.html)): Apply works on the selected type, Add puts the style in the document's character styles without applying it (`library.addToCharacterStyles`), Rename… renames the library's style in place (`library.renameItem`) and Delete removes it from the library only. Opening the menu applies nothing. Tests: `tests::library::a_library_character_style_is_added_to_the_document_without_applying_it`, `library_items_are_renamed_in_place`, `panels::libraries::tests::a_character_style_s_menu_applies_adds_renames_and_deletes`.
Object › Lock › All Artwork Above and Object › Hide › All Artwork Above deselect the selected objects they lock or hide, the key object included.