forked from 1b-agent/opencadstudio-upstream
Select Color: search boxes, readable icon buttons, cleaner Document and Color books layout
- Info line shows a colour-book colour as "BOOK - NAME". - Document tab: a search box (by name) replaces the "Colors in this drawing" heading; grid swatches no longer carry text; larger grid/list icons, dark on the accent colour when active, like the OK button. - Color books tab: no "Color book"/"Find" labels; the book list is as wide as the colour bars, and the search box (magnifier, gray "Search") and load button sit over the page strip and RGB values, all 28 px high; the load button and page arrows use the button's dark text colour. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_013rGmDUNr1hUf4zo1X3dak8
This commit is contained in:
27 files changed
+134
-110
No files matched your search
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#B4B6B9" stroke-width="2" stroke-linecap="round"><circle cx="10.5" cy="10.5" r="6"/><path d="M15 15l5 5"/></svg>
|
||||||
|
After Width: | Height: | Size: 193 B |
@@ -1361,7 +1361,6 @@ common =
|
|||||||
.color-number = رقم اللون
|
.color-number = رقم اللون
|
||||||
.color-name-az = الاسم أ–ي
|
.color-name-az = الاسم أ–ي
|
||||||
.color-name-za = الاسم ي–أ
|
.color-name-za = الاسم ي–أ
|
||||||
.color-in-drawing = الألوان في هذا الرسم
|
|
||||||
.color-sort = فرز
|
.color-sort = فرز
|
||||||
.color-no-drawing-colors = لا توجد ألوان في هذا الرسم بعد
|
.color-no-drawing-colors = لا توجد ألوان في هذا الرسم بعد
|
||||||
.color-books = كتب الألوان
|
.color-books = كتب الألوان
|
||||||
|
|||||||
@@ -1348,7 +1348,6 @@ common =
|
|||||||
.color-number = Номер на цвят
|
.color-number = Номер на цвят
|
||||||
.color-name-az = Име А–Я
|
.color-name-az = Име А–Я
|
||||||
.color-name-za = Име Я–А
|
.color-name-za = Име Я–А
|
||||||
.color-in-drawing = Цветове в този чертеж
|
|
||||||
.color-sort = Сортиране
|
.color-sort = Сортиране
|
||||||
.color-no-drawing-colors = Все още няма цветове в този чертеж
|
.color-no-drawing-colors = Все още няма цветове в този чертеж
|
||||||
.color-books = Цветови каталози
|
.color-books = Цветови каталози
|
||||||
|
|||||||
@@ -1348,7 +1348,6 @@ common =
|
|||||||
.color-number = Číslo barvy
|
.color-number = Číslo barvy
|
||||||
.color-name-az = Název A–Z
|
.color-name-az = Název A–Z
|
||||||
.color-name-za = Název Z–A
|
.color-name-za = Název Z–A
|
||||||
.color-in-drawing = Barvy v tomto výkresu
|
|
||||||
.color-sort = Řadit
|
.color-sort = Řadit
|
||||||
.color-no-drawing-colors = V tomto výkresu zatím nejsou žádné barvy
|
.color-no-drawing-colors = V tomto výkresu zatím nejsou žádné barvy
|
||||||
.color-books = Barevné vzorníky
|
.color-books = Barevné vzorníky
|
||||||
|
|||||||
@@ -1349,7 +1349,6 @@ common =
|
|||||||
.color-number = Farbnummer
|
.color-number = Farbnummer
|
||||||
.color-name-az = Name A–Z
|
.color-name-az = Name A–Z
|
||||||
.color-name-za = Name Z–A
|
.color-name-za = Name Z–A
|
||||||
.color-in-drawing = Farben in dieser Zeichnung
|
|
||||||
.color-sort = Sortieren
|
.color-sort = Sortieren
|
||||||
.color-no-drawing-colors = Noch keine Farben in dieser Zeichnung
|
.color-no-drawing-colors = Noch keine Farben in dieser Zeichnung
|
||||||
.color-books = Farbbücher
|
.color-books = Farbbücher
|
||||||
|
|||||||
@@ -1350,7 +1350,6 @@ common =
|
|||||||
.color-number = Αριθμός χρώματος
|
.color-number = Αριθμός χρώματος
|
||||||
.color-name-az = Όνομα Α–Ω
|
.color-name-az = Όνομα Α–Ω
|
||||||
.color-name-za = Όνομα Ω–Α
|
.color-name-za = Όνομα Ω–Α
|
||||||
.color-in-drawing = Χρώματα σε αυτό το σχέδιο
|
|
||||||
.color-sort = Ταξινόμηση
|
.color-sort = Ταξινόμηση
|
||||||
.color-no-drawing-colors = Δεν υπάρχουν ακόμη χρώματα σε αυτό το σχέδιο
|
.color-no-drawing-colors = Δεν υπάρχουν ακόμη χρώματα σε αυτό το σχέδιο
|
||||||
.color-books = Βιβλία χρωμάτων
|
.color-books = Βιβλία χρωμάτων
|
||||||
|
|||||||
@@ -1349,7 +1349,6 @@ common =
|
|||||||
.color-number = Color number
|
.color-number = Color number
|
||||||
.color-name-az = Name A–Z
|
.color-name-az = Name A–Z
|
||||||
.color-name-za = Name Z–A
|
.color-name-za = Name Z–A
|
||||||
.color-in-drawing = Colors in this drawing
|
|
||||||
.color-sort = Sort
|
.color-sort = Sort
|
||||||
.color-no-drawing-colors = No colors in this drawing yet
|
.color-no-drawing-colors = No colors in this drawing yet
|
||||||
.color-books = Color Books
|
.color-books = Color Books
|
||||||
|
|||||||
@@ -1349,7 +1349,6 @@ common =
|
|||||||
.color-number = Número de color
|
.color-number = Número de color
|
||||||
.color-name-az = Nombre A–Z
|
.color-name-az = Nombre A–Z
|
||||||
.color-name-za = Nombre Z–A
|
.color-name-za = Nombre Z–A
|
||||||
.color-in-drawing = Colores de este dibujo
|
|
||||||
.color-sort = Ordenar
|
.color-sort = Ordenar
|
||||||
.color-no-drawing-colors = Aún no hay colores en este dibujo
|
.color-no-drawing-colors = Aún no hay colores en este dibujo
|
||||||
.color-books = Libros de colores
|
.color-books = Libros de colores
|
||||||
|
|||||||
@@ -1348,7 +1348,6 @@ common =
|
|||||||
.color-number = Värin numero
|
.color-number = Värin numero
|
||||||
.color-name-az = Nimi A–Ö
|
.color-name-az = Nimi A–Ö
|
||||||
.color-name-za = Nimi Ö–A
|
.color-name-za = Nimi Ö–A
|
||||||
.color-in-drawing = Tämän piirustuksen värit
|
|
||||||
.color-sort = Lajittele
|
.color-sort = Lajittele
|
||||||
.color-no-drawing-colors = Tässä piirustuksessa ei ole vielä värejä
|
.color-no-drawing-colors = Tässä piirustuksessa ei ole vielä värejä
|
||||||
.color-books = Värikirjat
|
.color-books = Värikirjat
|
||||||
|
|||||||
@@ -1349,7 +1349,6 @@ common =
|
|||||||
.color-number = Numéro de couleur
|
.color-number = Numéro de couleur
|
||||||
.color-name-az = Nom A–Z
|
.color-name-az = Nom A–Z
|
||||||
.color-name-za = Nom Z–A
|
.color-name-za = Nom Z–A
|
||||||
.color-in-drawing = Couleurs de ce dessin
|
|
||||||
.color-sort = Trier
|
.color-sort = Trier
|
||||||
.color-no-drawing-colors = Aucune couleur dans ce dessin pour l'instant
|
.color-no-drawing-colors = Aucune couleur dans ce dessin pour l'instant
|
||||||
.color-books = Carnets de couleurs
|
.color-books = Carnets de couleurs
|
||||||
|
|||||||
@@ -1337,7 +1337,6 @@ common =
|
|||||||
.color-number = रंग संख्या
|
.color-number = रंग संख्या
|
||||||
.color-name-az = नाम A–Z
|
.color-name-az = नाम A–Z
|
||||||
.color-name-za = नाम Z–A
|
.color-name-za = नाम Z–A
|
||||||
.color-in-drawing = इस ड्रॉइंग के रंग
|
|
||||||
.color-sort = क्रमबद्ध करें
|
.color-sort = क्रमबद्ध करें
|
||||||
.color-no-drawing-colors = इस ड्रॉइंग में अभी तक कोई रंग नहीं है
|
.color-no-drawing-colors = इस ड्रॉइंग में अभी तक कोई रंग नहीं है
|
||||||
.color-books = रंग पुस्तकें
|
.color-books = रंग पुस्तकें
|
||||||
|
|||||||
@@ -1348,7 +1348,6 @@ common =
|
|||||||
.color-number = Színszám
|
.color-number = Színszám
|
||||||
.color-name-az = Név A–Z
|
.color-name-az = Név A–Z
|
||||||
.color-name-za = Név Z–A
|
.color-name-za = Név Z–A
|
||||||
.color-in-drawing = Színek ebben a rajzban
|
|
||||||
.color-sort = Rendezés
|
.color-sort = Rendezés
|
||||||
.color-no-drawing-colors = Ebben a rajzban még nincsenek színek
|
.color-no-drawing-colors = Ebben a rajzban még nincsenek színek
|
||||||
.color-books = Színkönyvek
|
.color-books = Színkönyvek
|
||||||
|
|||||||
@@ -1348,7 +1348,6 @@ common =
|
|||||||
.color-number = Numero colore
|
.color-number = Numero colore
|
||||||
.color-name-az = Nome A–Z
|
.color-name-az = Nome A–Z
|
||||||
.color-name-za = Nome Z–A
|
.color-name-za = Nome Z–A
|
||||||
.color-in-drawing = Colori in questo disegno
|
|
||||||
.color-sort = Ordina
|
.color-sort = Ordina
|
||||||
.color-no-drawing-colors = Ancora nessun colore in questo disegno
|
.color-no-drawing-colors = Ancora nessun colore in questo disegno
|
||||||
.color-books = Album colori
|
.color-books = Album colori
|
||||||
|
|||||||
@@ -1339,7 +1339,6 @@ common =
|
|||||||
.color-number = 色番号
|
.color-number = 色番号
|
||||||
.color-name-az = 名前 (昇順)
|
.color-name-az = 名前 (昇順)
|
||||||
.color-name-za = 名前 (降順)
|
.color-name-za = 名前 (降順)
|
||||||
.color-in-drawing = この図面の色
|
|
||||||
.color-sort = 並べ替え
|
.color-sort = 並べ替え
|
||||||
.color-no-drawing-colors = この図面にはまだ色がありません
|
.color-no-drawing-colors = この図面にはまだ色がありません
|
||||||
.color-books = カラー ブック
|
.color-books = カラー ブック
|
||||||
|
|||||||
@@ -1348,7 +1348,6 @@ common =
|
|||||||
.color-number = 색상 번호
|
.color-number = 색상 번호
|
||||||
.color-name-az = 이름 오름차순
|
.color-name-az = 이름 오름차순
|
||||||
.color-name-za = 이름 내림차순
|
.color-name-za = 이름 내림차순
|
||||||
.color-in-drawing = 이 도면의 색상
|
|
||||||
.color-sort = 정렬
|
.color-sort = 정렬
|
||||||
.color-no-drawing-colors = 이 도면에는 아직 색상이 없습니다
|
.color-no-drawing-colors = 이 도면에는 아직 색상이 없습니다
|
||||||
.color-books = 색상표
|
.color-books = 색상표
|
||||||
|
|||||||
@@ -1354,7 +1354,6 @@ common =
|
|||||||
.color-number = ເລກສີ
|
.color-number = ເລກສີ
|
||||||
.color-name-az = ຊື່ A–Z
|
.color-name-az = ຊື່ A–Z
|
||||||
.color-name-za = ຊື່ Z–A
|
.color-name-za = ຊື່ Z–A
|
||||||
.color-in-drawing = ສີໃນແບບແຕ້ມນີ້
|
|
||||||
.color-sort = ຈັດລຽງ
|
.color-sort = ຈັດລຽງ
|
||||||
.color-no-drawing-colors = ຍັງບໍ່ມີສີໃນແບບແຕ້ມນີ້
|
.color-no-drawing-colors = ຍັງບໍ່ມີສີໃນແບບແຕ້ມນີ້
|
||||||
.color-books = ປຶ້ມສີ
|
.color-books = ປຶ້ມສີ
|
||||||
|
|||||||
@@ -1347,7 +1347,6 @@ common =
|
|||||||
.color-number = Kleurnummer
|
.color-number = Kleurnummer
|
||||||
.color-name-az = Naam A–Z
|
.color-name-az = Naam A–Z
|
||||||
.color-name-za = Naam Z–A
|
.color-name-za = Naam Z–A
|
||||||
.color-in-drawing = Kleuren in deze tekening
|
|
||||||
.color-sort = Sorteren
|
.color-sort = Sorteren
|
||||||
.color-no-drawing-colors = Nog geen kleuren in deze tekening
|
.color-no-drawing-colors = Nog geen kleuren in deze tekening
|
||||||
.color-books = Kleurboeken
|
.color-books = Kleurboeken
|
||||||
|
|||||||
@@ -1348,7 +1348,6 @@ common =
|
|||||||
.color-number = Numer koloru
|
.color-number = Numer koloru
|
||||||
.color-name-az = Nazwa A–Z
|
.color-name-az = Nazwa A–Z
|
||||||
.color-name-za = Nazwa Z–A
|
.color-name-za = Nazwa Z–A
|
||||||
.color-in-drawing = Kolory w tym rysunku
|
|
||||||
.color-sort = Sortuj
|
.color-sort = Sortuj
|
||||||
.color-no-drawing-colors = Brak kolorów w tym rysunku
|
.color-no-drawing-colors = Brak kolorów w tym rysunku
|
||||||
.color-books = Wzorniki kolorów
|
.color-books = Wzorniki kolorów
|
||||||
|
|||||||
@@ -1349,7 +1349,6 @@ common =
|
|||||||
.color-number = Número da cor
|
.color-number = Número da cor
|
||||||
.color-name-az = Nome A–Z
|
.color-name-az = Nome A–Z
|
||||||
.color-name-za = Nome Z–A
|
.color-name-za = Nome Z–A
|
||||||
.color-in-drawing = Cores neste desenho
|
|
||||||
.color-sort = Ordenar
|
.color-sort = Ordenar
|
||||||
.color-no-drawing-colors = Ainda não há cores neste desenho
|
.color-no-drawing-colors = Ainda não há cores neste desenho
|
||||||
.color-books = Catálogos de cores
|
.color-books = Catálogos de cores
|
||||||
|
|||||||
@@ -1352,7 +1352,6 @@ common =
|
|||||||
.color-number = Номер цвета
|
.color-number = Номер цвета
|
||||||
.color-name-az = Имя А–Я
|
.color-name-az = Имя А–Я
|
||||||
.color-name-za = Имя Я–А
|
.color-name-za = Имя Я–А
|
||||||
.color-in-drawing = Цвета в этом чертеже
|
|
||||||
.color-sort = Сортировка
|
.color-sort = Сортировка
|
||||||
.color-no-drawing-colors = В этом чертеже пока нет цветов
|
.color-no-drawing-colors = В этом чертеже пока нет цветов
|
||||||
.color-books = Альбомы цветов
|
.color-books = Альбомы цветов
|
||||||
|
|||||||
@@ -1335,7 +1335,6 @@ common =
|
|||||||
.color-number = Renk numarası
|
.color-number = Renk numarası
|
||||||
.color-name-az = Ad A–Z
|
.color-name-az = Ad A–Z
|
||||||
.color-name-za = Ad Z–A
|
.color-name-za = Ad Z–A
|
||||||
.color-in-drawing = Bu çizimdeki renkler
|
|
||||||
.color-sort = Sırala
|
.color-sort = Sırala
|
||||||
.color-no-drawing-colors = Bu çizimde henüz renk yok
|
.color-no-drawing-colors = Bu çizimde henüz renk yok
|
||||||
.color-books = Renk kitapları
|
.color-books = Renk kitapları
|
||||||
|
|||||||
@@ -1336,7 +1336,6 @@ common =
|
|||||||
.color-number = 颜色编号
|
.color-number = 颜色编号
|
||||||
.color-name-az = 名称 A–Z
|
.color-name-az = 名称 A–Z
|
||||||
.color-name-za = 名称 Z–A
|
.color-name-za = 名称 Z–A
|
||||||
.color-in-drawing = 此图形中的颜色
|
|
||||||
.color-sort = 排序
|
.color-sort = 排序
|
||||||
.color-no-drawing-colors = 此图形中还没有颜色
|
.color-no-drawing-colors = 此图形中还没有颜色
|
||||||
.color-books = 配色系统
|
.color-books = 配色系统
|
||||||
|
|||||||
@@ -1348,7 +1348,6 @@ common =
|
|||||||
.color-number = 顏色編號
|
.color-number = 顏色編號
|
||||||
.color-name-az = 名稱 A–Z
|
.color-name-az = 名稱 A–Z
|
||||||
.color-name-za = 名稱 Z–A
|
.color-name-za = 名稱 Z–A
|
||||||
.color-in-drawing = 此圖面中的顏色
|
|
||||||
.color-sort = 排序
|
.color-sort = 排序
|
||||||
.color-no-drawing-colors = 此圖面中還沒有顏色
|
.color-no-drawing-colors = 此圖面中還沒有顏色
|
||||||
.color-books = 配色系統
|
.color-books = 配色系統
|
||||||
|
|||||||
@@ -4725,7 +4725,6 @@ pub(super) fn message_attribute(source: &str) -> Option<(&'static str, &'static
|
|||||||
"Color number" => Some(("common", "color-number")),
|
"Color number" => Some(("common", "color-number")),
|
||||||
"Name A–Z" => Some(("common", "color-name-az")),
|
"Name A–Z" => Some(("common", "color-name-az")),
|
||||||
"Name Z–A" => Some(("common", "color-name-za")),
|
"Name Z–A" => Some(("common", "color-name-za")),
|
||||||
"Colors in this drawing" => Some(("common", "color-in-drawing")),
|
|
||||||
"Sort" => Some(("common", "color-sort")),
|
"Sort" => Some(("common", "color-sort")),
|
||||||
"No colors in this drawing yet" => Some(("common", "color-no-drawing-colors")),
|
"No colors in this drawing yet" => Some(("common", "color-no-drawing-colors")),
|
||||||
"Color Books" => Some(("common", "color-books")),
|
"Color Books" => Some(("common", "color-books")),
|
||||||
|
|||||||
@@ -21,16 +21,6 @@ pub struct DocColor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl DocColor {
|
impl DocColor {
|
||||||
/// The text drawn on the swatch: the index number, `RGB`, or the
|
|
||||||
/// colour-book colour's own name.
|
|
||||||
pub fn tag(&self) -> String {
|
|
||||||
match (&self.name, self.color) {
|
|
||||||
(Some(_), _) => self.label(),
|
|
||||||
(None, AcadColor::Index(i)) => i.to_string(),
|
|
||||||
_ => "RGB".to_string(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The name in the list view: the colour-book colour's own name (without
|
/// The name in the list view: the colour-book colour's own name (without
|
||||||
/// the book), `ACI n` or `#RRGGBB`.
|
/// the book), `ACI n` or `#RRGGBB`.
|
||||||
pub fn label(&self) -> String {
|
pub fn label(&self) -> String {
|
||||||
@@ -225,9 +215,9 @@ mod tests {
|
|||||||
assert_eq!(colors[0].uses, 3);
|
assert_eq!(colors[0].uses, 3);
|
||||||
assert_eq!(colors[0].newest, Handle::new(3));
|
assert_eq!(colors[0].newest, Handle::new(3));
|
||||||
assert_eq!(colors[3].name, None, "an empty name is no name");
|
assert_eq!(colors[3].name, None, "an empty name is no name");
|
||||||
assert_eq!(colors[2].tag(), "RAL 5015");
|
assert_eq!(colors[2].label(), "RAL 5015");
|
||||||
assert_eq!(colors[0].tag(), "1");
|
assert_eq!(colors[0].label(), "ACI 1");
|
||||||
assert_eq!(colors[1].tag(), "RGB");
|
assert_eq!(colors[1].label(), "#39BFFC");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
+129
-74
@@ -29,6 +29,10 @@ const BODY_HEIGHT: f32 = 368.0;
|
|||||||
const DOC_COLUMNS: usize = 8;
|
const DOC_COLUMNS: usize = 8;
|
||||||
/// Search matches shown at once in the Color books tab.
|
/// Search matches shown at once in the Color books tab.
|
||||||
const PAGE_BARS: usize = 7;
|
const PAGE_BARS: usize = 7;
|
||||||
|
/// Height of the search boxes, dropdowns and icon buttons.
|
||||||
|
const CONTROL_HEIGHT: f32 = 28.0;
|
||||||
|
/// Width of the page strip, the RGB values and the gap between them.
|
||||||
|
const SIDE_WIDTH: f32 = 26.0 + 10.0 + 104.0;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
|
||||||
pub enum ColorPickerTab {
|
pub enum ColorPickerTab {
|
||||||
@@ -55,6 +59,8 @@ pub enum ColorPickerMsg {
|
|||||||
PickDocument(usize),
|
PickDocument(usize),
|
||||||
DocSort(DocSort),
|
DocSort(DocSort),
|
||||||
DocView(DocView),
|
DocView(DocView),
|
||||||
|
/// Filter the Document tab by name.
|
||||||
|
DocQuery(String),
|
||||||
/// Show another loaded colour book.
|
/// Show another loaded colour book.
|
||||||
Book(usize),
|
Book(usize),
|
||||||
BookPage(usize),
|
BookPage(usize),
|
||||||
@@ -96,6 +102,7 @@ pub struct ColorPicker {
|
|||||||
doc: Vec<DocColor>,
|
doc: Vec<DocColor>,
|
||||||
doc_sort: DocSort,
|
doc_sort: DocSort,
|
||||||
doc_view: DocView,
|
doc_view: DocView,
|
||||||
|
doc_query: String,
|
||||||
/// This drawing's colours picked this session, newest first.
|
/// This drawing's colours picked this session, newest first.
|
||||||
recent: Vec<AcadColor>,
|
recent: Vec<AcadColor>,
|
||||||
books: Arc<Vec<ColorBook>>,
|
books: Arc<Vec<ColorBook>>,
|
||||||
@@ -123,6 +130,7 @@ impl ColorPicker {
|
|||||||
doc: Vec::new(),
|
doc: Vec::new(),
|
||||||
doc_sort: DocSort::default(),
|
doc_sort: DocSort::default(),
|
||||||
doc_view: DocView::default(),
|
doc_view: DocView::default(),
|
||||||
|
doc_query: String::new(),
|
||||||
recent: Vec::new(),
|
recent: Vec::new(),
|
||||||
books: Arc::default(),
|
books: Arc::default(),
|
||||||
book: 0,
|
book: 0,
|
||||||
@@ -295,6 +303,7 @@ impl ColorPicker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
ColorPickerMsg::DocView(view) => self.doc_view = view,
|
ColorPickerMsg::DocView(view) => self.doc_view = view,
|
||||||
|
ColorPickerMsg::DocQuery(query) => self.doc_query = query,
|
||||||
ColorPickerMsg::DocSort(by) => {
|
ColorPickerMsg::DocSort(by) => {
|
||||||
self.doc_sort = by;
|
self.doc_sort = by;
|
||||||
document::sort(&mut self.doc, by, &self.recent);
|
document::sort(&mut self.doc, by, &self.recent);
|
||||||
@@ -386,7 +395,7 @@ impl ColorPicker {
|
|||||||
(Some(status), _) => status.clone(),
|
(Some(status), _) => status.clone(),
|
||||||
(None, Some(name)) => {
|
(None, Some(name)) => {
|
||||||
let (r, g, b) = math::color_rgb(self.pending).unwrap_or_default();
|
let (r, g, b) = math::color_rgb(self.pending).unwrap_or_default();
|
||||||
format!("{name} · RGB {r}, {g}, {b}")
|
format!("{} · RGB {r}, {g}, {b}", name.replacen('$', " - ", 1))
|
||||||
}
|
}
|
||||||
(None, None) => math::describe(self.pending),
|
(None, None) => math::describe(self.pending),
|
||||||
};
|
};
|
||||||
@@ -586,16 +595,11 @@ impl ColorPicker {
|
|||||||
|
|
||||||
fn document_tab(&self) -> Element<'_, Message> {
|
fn document_tab(&self) -> Element<'_, Message> {
|
||||||
let header = row![
|
let header = row![
|
||||||
text(t!("Colors in this drawing")).size(11),
|
search_box(&self.doc_query, |query| ColorPickerMsg::DocQuery(query)),
|
||||||
text(format!("· {}", self.doc.len()))
|
|
||||||
.size(11)
|
|
||||||
.style(muted_text),
|
|
||||||
Space::new().width(Length::Fill),
|
|
||||||
text(t!("Sort")).size(11).style(muted_text),
|
|
||||||
pick_list(Some(self.doc_sort), &DocSort::ALL[..], DocSort::to_string)
|
pick_list(Some(self.doc_sort), &DocSort::ALL[..], DocSort::to_string)
|
||||||
.on_select(|by| picker_msg(ColorPickerMsg::DocSort(by)))
|
.on_select(|by| picker_msg(ColorPickerMsg::DocSort(by)))
|
||||||
.text_size(12)
|
.text_size(12)
|
||||||
.padding([3, 6]),
|
.padding([6, 8]),
|
||||||
row![
|
row![
|
||||||
self.view_button(crate::ui::icons::GRID, DocView::Grid),
|
self.view_button(crate::ui::icons::GRID, DocView::Grid),
|
||||||
self.view_button(crate::ui::icons::LIST, DocView::List),
|
self.view_button(crate::ui::icons::LIST, DocView::List),
|
||||||
@@ -612,11 +616,23 @@ impl ColorPicker {
|
|||||||
.spacing(10)
|
.spacing(10)
|
||||||
.into();
|
.into();
|
||||||
}
|
}
|
||||||
|
// Indices stay those of `doc`, which the pick messages refer to.
|
||||||
|
let query = self.doc_query.trim().to_lowercase();
|
||||||
|
let shown: Vec<(usize, &DocColor)> = self
|
||||||
|
.doc
|
||||||
|
.iter()
|
||||||
|
.enumerate()
|
||||||
|
.filter(|(_, entry)| query.is_empty() || entry.label().to_lowercase().contains(&query))
|
||||||
|
.collect();
|
||||||
|
if shown.is_empty() {
|
||||||
|
return column![header, empty_note(t!("No colors match").into_owned())]
|
||||||
|
.spacing(10)
|
||||||
|
.into();
|
||||||
|
}
|
||||||
let list: Element<'_, Message> = if self.doc_view == DocView::List {
|
let list: Element<'_, Message> = if self.doc_view == DocView::List {
|
||||||
self.doc
|
shown
|
||||||
.iter()
|
.iter()
|
||||||
.enumerate()
|
.fold(column![].spacing(2), |list, &(i, entry)| {
|
||||||
.fold(column![].spacing(2), |list, (i, entry)| {
|
|
||||||
let fill = math::color_rgb(entry.color)
|
let fill = math::color_rgb(entry.color)
|
||||||
.map_or(Color::from_rgb8(128, 128, 128), rgb_color);
|
.map_or(Color::from_rgb8(128, 128, 128), rgb_color);
|
||||||
let selected = self.pending == entry.color && self.pending_name == entry.name;
|
let selected = self.pending == entry.color && self.pending_name == entry.name;
|
||||||
@@ -632,7 +648,7 @@ impl ColorPicker {
|
|||||||
})
|
})
|
||||||
.into()
|
.into()
|
||||||
} else {
|
} else {
|
||||||
self.doc_grid()
|
self.doc_grid(&shown)
|
||||||
};
|
};
|
||||||
column![
|
column![
|
||||||
header,
|
header,
|
||||||
@@ -646,30 +662,47 @@ impl ColorPicker {
|
|||||||
.into()
|
.into()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Grid or list toggle for the Document tab.
|
/// Grid or list toggle for the Document tab: dark on the accent colour
|
||||||
|
/// when active, like the OK button.
|
||||||
fn view_button(&self, icon: &'static [u8], view: DocView) -> Element<'_, Message> {
|
fn view_button(&self, icon: &'static [u8], view: DocView) -> Element<'_, Message> {
|
||||||
let active = self.doc_view == view;
|
let active = self.doc_view == view;
|
||||||
button(
|
button(
|
||||||
svg(crate::ui::icons::themed_handle(icon))
|
container(
|
||||||
.width(14)
|
svg(crate::ui::icons::themed_handle(icon))
|
||||||
.height(14),
|
.width(18)
|
||||||
|
.height(18)
|
||||||
|
.style(move |theme: &Theme, _status| svg::Style {
|
||||||
|
color: Some(if active {
|
||||||
|
theme.palette().primary.base.text
|
||||||
|
} else {
|
||||||
|
theme.palette().background.base.text
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.center(Length::Fill),
|
||||||
)
|
)
|
||||||
.on_press(picker_msg(ColorPickerMsg::DocView(view)))
|
.on_press(picker_msg(ColorPickerMsg::DocView(view)))
|
||||||
.padding(5)
|
.width(CONTROL_HEIGHT)
|
||||||
.style(move |theme: &Theme, status| toggle_style(theme, active, status))
|
.height(CONTROL_HEIGHT)
|
||||||
|
.padding(0)
|
||||||
|
.style(move |theme: &Theme, status| {
|
||||||
|
if active {
|
||||||
|
button::primary(theme, status)
|
||||||
|
} else {
|
||||||
|
toggle_style(theme, false, status)
|
||||||
|
}
|
||||||
|
})
|
||||||
.into()
|
.into()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn doc_grid(&self) -> Element<'_, Message> {
|
fn doc_grid<'a>(&self, shown: &[(usize, &'a DocColor)]) -> Element<'a, Message> {
|
||||||
self.doc
|
shown
|
||||||
.chunks(DOC_COLUMNS)
|
.chunks(DOC_COLUMNS)
|
||||||
.enumerate()
|
.fold(column![].spacing(4), |grid, chunk| {
|
||||||
.fold(column![].spacing(4), |grid, (r, chunk)| {
|
|
||||||
let line = chunk
|
let line = chunk
|
||||||
.iter()
|
.iter()
|
||||||
.enumerate()
|
.fold(row![].spacing(4), |line, &(i, entry)| {
|
||||||
.fold(row![].spacing(4), |line, (c, entry)| {
|
line.push(self.doc_swatch(i, entry))
|
||||||
line.push(self.doc_swatch(r * DOC_COLUMNS + c, entry))
|
|
||||||
});
|
});
|
||||||
let line = (chunk.len()..DOC_COLUMNS)
|
let line = (chunk.len()..DOC_COLUMNS)
|
||||||
.fold(line, |line, _| line.push(Space::new().width(Length::Fill)));
|
.fold(line, |line, _| line.push(Space::new().width(Length::Fill)));
|
||||||
@@ -681,19 +714,8 @@ impl ColorPicker {
|
|||||||
fn doc_swatch<'a>(&self, i: usize, entry: &'a DocColor) -> Element<'a, Message> {
|
fn doc_swatch<'a>(&self, i: usize, entry: &'a DocColor) -> Element<'a, Message> {
|
||||||
let fill = math::color_rgb(entry.color).map_or(Color::from_rgb8(128, 128, 128), rgb_color);
|
let fill = math::color_rgb(entry.color).map_or(Color::from_rgb8(128, 128, 128), rgb_color);
|
||||||
let selected = self.pending == entry.color && self.pending_name == entry.name;
|
let selected = self.pending == entry.color && self.pending_name == entry.name;
|
||||||
button(
|
button(Space::new())
|
||||||
container(
|
.on_press(picker_msg(ColorPickerMsg::PickDocument(i)))
|
||||||
text(entry.tag())
|
|
||||||
.size(10)
|
|
||||||
.font(iced::Font::MONOSPACE)
|
|
||||||
.color(ink(fill)),
|
|
||||||
)
|
|
||||||
.align_y(iced::Bottom)
|
|
||||||
.padding([1, 4])
|
|
||||||
.height(Length::Fill)
|
|
||||||
.clip(true),
|
|
||||||
)
|
|
||||||
.on_press(picker_msg(ColorPickerMsg::PickDocument(i)))
|
|
||||||
.padding(0)
|
.padding(0)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(30)
|
.height(30)
|
||||||
@@ -720,45 +742,39 @@ impl ColorPicker {
|
|||||||
.center(Length::Fill)
|
.center(Length::Fill)
|
||||||
.into();
|
.into();
|
||||||
};
|
};
|
||||||
let label = |label: std::borrow::Cow<'static, str>| text(label).size(11).style(muted_text);
|
// The book list as wide as the colour bars; the search box and the
|
||||||
|
// load button over the page strip and the RGB values.
|
||||||
let books = Arc::clone(&self.books);
|
let books = Arc::clone(&self.books);
|
||||||
let top = row![
|
let top = row![
|
||||||
column![
|
pick_list(
|
||||||
label(t!("Color book")),
|
Some(self.book),
|
||||||
pick_list(
|
(0..self.books.len()).collect::<Vec<_>>(),
|
||||||
Some(self.book),
|
move |&i| books[i].name.clone(),
|
||||||
(0..self.books.len()).collect::<Vec<_>>(),
|
|
||||||
move |&i| books[i].name.clone(),
|
|
||||||
)
|
|
||||||
.on_select(|i| picker_msg(ColorPickerMsg::Book(i)))
|
|
||||||
.text_size(12)
|
|
||||||
.padding([4, 6])
|
|
||||||
.width(Length::Fill),
|
|
||||||
]
|
|
||||||
.spacing(4)
|
|
||||||
.width(Length::Fill),
|
|
||||||
column![
|
|
||||||
label(t!("Find")),
|
|
||||||
text_input("", &self.book_query)
|
|
||||||
.on_input(|query| picker_msg(ColorPickerMsg::BookQuery(query)))
|
|
||||||
.size(12)
|
|
||||||
.padding([5, 8])
|
|
||||||
.font(iced::Font::MONOSPACE)
|
|
||||||
.width(116),
|
|
||||||
]
|
|
||||||
.spacing(4),
|
|
||||||
load_button(
|
|
||||||
svg(crate::ui::icons::themed_handle(
|
|
||||||
crate::ui::icons::FOLDER_OPEN
|
|
||||||
))
|
|
||||||
.width(15)
|
|
||||||
.height(15)
|
|
||||||
.into()
|
|
||||||
)
|
)
|
||||||
.padding([6, 7]),
|
.on_select(|i| picker_msg(ColorPickerMsg::Book(i)))
|
||||||
|
.text_size(12)
|
||||||
|
.padding([6, 8])
|
||||||
|
.width(Length::Fill),
|
||||||
|
row![
|
||||||
|
search_box(&self.book_query, |query| ColorPickerMsg::BookQuery(query)),
|
||||||
|
load_button(
|
||||||
|
container(secondary_icon(crate::ui::icons::themed_handle(
|
||||||
|
crate::ui::icons::FOLDER_OPEN
|
||||||
|
))
|
||||||
|
.width(16)
|
||||||
|
.height(16))
|
||||||
|
.center(Length::Fill)
|
||||||
|
.into()
|
||||||
|
)
|
||||||
|
.width(CONTROL_HEIGHT)
|
||||||
|
.height(CONTROL_HEIGHT)
|
||||||
|
.padding(0),
|
||||||
|
]
|
||||||
|
.spacing(6)
|
||||||
|
.width(SIDE_WIDTH),
|
||||||
]
|
]
|
||||||
.spacing(8)
|
.spacing(10)
|
||||||
.align_y(iced::Bottom);
|
.align_y(iced::Center);
|
||||||
|
|
||||||
// The page's colours, or the first matches while searching.
|
// The page's colours, or the first matches while searching.
|
||||||
let selected = self.book_selection();
|
let selected = self.book_selection();
|
||||||
@@ -829,7 +845,7 @@ impl ColorPicker {
|
|||||||
.width(9)
|
.width(9)
|
||||||
.height(5)
|
.height(5)
|
||||||
.style(|theme: &Theme, _status| svg::Style {
|
.style(|theme: &Theme, _status| svg::Style {
|
||||||
color: Some(theme.palette().background.base.text),
|
color: Some(theme.palette().secondary.base.text),
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
.on_press(picker_msg(ColorPickerMsg::BookPage(page)))
|
.on_press(picker_msg(ColorPickerMsg::BookPage(page)))
|
||||||
@@ -1082,6 +1098,45 @@ fn color_bar<'a>(
|
|||||||
.style(move |theme: &Theme, status| swatch_button_style(theme, status, fill, selected))
|
.style(move |theme: &Theme, status| swatch_button_style(theme, status, fill, selected))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A search field with a magnifier and a gray "Search" placeholder.
|
||||||
|
fn search_box<'a>(
|
||||||
|
value: &str,
|
||||||
|
on_input: impl Fn(String) -> ColorPickerMsg + 'a,
|
||||||
|
) -> Element<'a, Message> {
|
||||||
|
iced::widget::stack![
|
||||||
|
text_input(&t!("Search"), value)
|
||||||
|
.on_input(move |query| picker_msg(on_input(query)))
|
||||||
|
.size(12)
|
||||||
|
.padding(iced::Padding {
|
||||||
|
top: 6.0,
|
||||||
|
right: 8.0,
|
||||||
|
bottom: 6.0,
|
||||||
|
left: 28.0,
|
||||||
|
})
|
||||||
|
.width(Length::Fill),
|
||||||
|
container(
|
||||||
|
svg(crate::ui::icons::themed_handle(crate::ui::icons::SEARCH))
|
||||||
|
.width(14)
|
||||||
|
.height(14)
|
||||||
|
.style(|theme: &Theme, _status| svg::Style {
|
||||||
|
color: Some(theme.palette().background.base.text.scale_alpha(0.5)),
|
||||||
|
}),
|
||||||
|
)
|
||||||
|
.padding([0, 8])
|
||||||
|
.height(Length::Fill)
|
||||||
|
.center_y(Length::Fill),
|
||||||
|
]
|
||||||
|
.width(Length::Fill)
|
||||||
|
.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An icon in the text colour of a secondary button, so it reads on it.
|
||||||
|
fn secondary_icon<'a>(handle: svg::Handle) -> svg::Svg<'a> {
|
||||||
|
svg(handle).style(|theme: &Theme, _status| svg::Style {
|
||||||
|
color: Some(theme.palette().secondary.base.text),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// A short gray note in the middle of the free space.
|
/// A short gray note in the middle of the free space.
|
||||||
fn empty_note<'a>(note: String) -> Element<'a, Message> {
|
fn empty_note<'a>(note: String) -> Element<'a, Message> {
|
||||||
container(text(note).size(12).style(muted_text))
|
container(text(note).size(12).style(muted_text))
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ pub static SPLIT_V: &[u8] = include_bytes!("../../assets/icons/ui/split_v.svg");
|
|||||||
pub static SPLIT_H: &[u8] = include_bytes!("../../assets/icons/ui/split_h.svg");
|
pub static SPLIT_H: &[u8] = include_bytes!("../../assets/icons/ui/split_h.svg");
|
||||||
pub static GRID: &[u8] = include_bytes!("../../assets/icons/ui/grid.svg");
|
pub static GRID: &[u8] = include_bytes!("../../assets/icons/ui/grid.svg");
|
||||||
pub static LIST: &[u8] = include_bytes!("../../assets/icons/ui/list.svg");
|
pub static LIST: &[u8] = include_bytes!("../../assets/icons/ui/list.svg");
|
||||||
|
pub static SEARCH: &[u8] = include_bytes!("../../assets/icons/ui/search.svg");
|
||||||
pub static SNAP: &[u8] = include_bytes!("../../assets/icons/ui/snap.svg");
|
pub static SNAP: &[u8] = include_bytes!("../../assets/icons/ui/snap.svg");
|
||||||
pub static DOC_NEW: &[u8] = include_bytes!("../../assets/icons/ui/doc_new.svg");
|
pub static DOC_NEW: &[u8] = include_bytes!("../../assets/icons/ui/doc_new.svg");
|
||||||
pub static DOC: &[u8] = include_bytes!("../../assets/icons/ui/doc.svg");
|
pub static DOC: &[u8] = include_bytes!("../../assets/icons/ui/doc.svg");
|
||||||
|
|||||||
Reference in new issue
Block a user