Navigator: View Artboard Contents Only is on by default and hides art outside the artboards

The Navigator panel menu item View Artboard Only is renamed View Artboard
Contents Only and is now on by default. While it is on, the thumbnail
fits the artboards and draws only the art inside them: art on the
pasteboard and in the gaps between artboards is left out, and a shape
that crosses an artboard's edge is cut there. Before, the option only
narrowed the thumbnail to the artboards' bounding box, so art in the
gaps and past an artboard's edge still showed.

The choice is kept with the UI state for every document, instead of
being lost on restart. UI state saved without it reads it as on, and a
saved off stays off. A user who wants the pasteboard art in the
thumbnail turns the menu item off, or runs
ui.navigatorPanelOptions {viewArtboardContentsOnly: false}.

- ui.navigatorPanelOptions takes viewArtboardContentsOnly (true or
  false; any other value is an error and changes nothing) and answers
  {color, solidDashes, viewArtboardContentsOnly}.
- The renamed label has a row in every catalog that had the old one.

Docs: docs/mcp.md (Navigator panel options), docs/target-app-parity.md.
This commit is contained in:
dotCooCoo
2026-11-16 12:25:17 -08:00
parent 5fd8cf2c45
commit c0667364ed
36 changed files with 207 additions and 54 deletions
+1 -1
View File
@@ -1097,7 +1097,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
"ui.navigatorPanelOptions",
"Panel Options…",
"",
"{color?: #rrggbb or a preset name (Light Red, the default, then the layer colors such as \"Light Blue\"), solidDashes?: bool (Draw Dashed Lines as Solid Lines, off by default: the Navigator's thumbnail draws dashed strokes without their dashes; the canvas, printing and exports keep them)} set the Navigator panel's options, the color its view box is drawn in and solid dashes (kept with the UI state) → {color, solidDashes}; with neither, open its Panel Options (dialog `navigatorPanelOptions`, fields color, solidDashes; OK sets them); an error for a value that is not a color or not true or false, which changes nothing",
"{color?: #rrggbb or a preset name (Light Red, the default, then the layer colors such as \"Light Blue\"), solidDashes?: bool (Draw Dashed Lines as Solid Lines, off by default: the Navigator's thumbnail draws dashed strokes without their dashes; the canvas, printing and exports keep them), viewArtboardContentsOnly?: bool (View Artboard Contents Only in the panel menu, on by default and for UI state saved without it: the thumbnail fits the artboards and draws only the art inside them, cut at each artboard's edges; off, it also shows the art on the pasteboard)} set the Navigator panel's options, the color its view box is drawn in, solid dashes and artboard contents only (kept with the UI state) → {color, solidDashes, viewArtboardContentsOnly}; with none, open its Panel Options (dialog `navigatorPanelOptions`, fields color, solidDashes; OK sets them); an error for a value that is not a color or not true or false, which changes nothing",
),
(
"ui.layersExpand",
@@ -85,7 +85,7 @@ mod tests {
d.fields.insert("solidDashes".into(), json!(solid));
super::super::confirm(app)
};
assert_eq!(set(&mut app, "Green", true).unwrap(), json!({"color": "#4fff4f", "solidDashes": true}));
assert_eq!(set(&mut app, "Green", true).unwrap(), json!({"color": "#4fff4f", "solidDashes": true, "viewArtboardContentsOnly": true}));
assert!(app.ui.dialog.is_none());
app.run("ui.navigatorPanelOptions", json!({})).unwrap();
set(&mut app, "#0000FF", true).unwrap();
+1 -1
View File
@@ -4012,7 +4012,7 @@ digits Malayalam Малаялам
Vertical: Вертикално:
Very High Много високо
View Изглед
View Artboard Only Преглед само на работна област
View Artboard Contents Only Преглед само на съдържанието на работната област
View Opacity Mask Преглед на маска за непрозрачност
View PDF after saving Преглед на PDF след запазване
View {n} Изглед {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -2031,7 +2031,7 @@ digits Malayalam Malajalam
Stroke: click for swatches, Shift-click for the color mixer Potez: kliknite za uzorke boja, Shift-klik za mikser boja
This panel is on the roadmap (see the parity plan). Ovaj panel je u planu (vidi plan usklađenosti).
Open a document to navigate it. Otvorite dokument da se krećete kroz njega.
View Artboard Only Prikaži samo radnu ploču
View Artboard Contents Only Prikaži samo sadržaj radne ploče
Contextual Alternates Kontekstualne alternative
Default Figure Zadane brojke
Discretionary Ligatures Diskrecione ligature
Can't render this file because it contains an unexpected character in line 2 and column 73.
+1 -1
View File
@@ -5259,7 +5259,7 @@ digits Malayalam Malaiàlam
Update While Dragging Actualitza mentre s’arrossega
Video Thumbnail 1280×720 Miniatura de vídeo 1280×720
View Visualitza
View Artboard Only Visualitza només el tauler
View Artboard Contents Only Visualitza només el contingut del tauler
View Opacity Mask Visualitza la màscara d’opacitat
View PDF after saving Visualitza el PDF després de desar
View {n} Vista {n}
Can't render this file because it contains an unexpected character in line 2 and column 73.
+1 -1
View File
@@ -2104,7 +2104,7 @@ digits Malayalam Malajálamské
Stroke: click for swatches, Shift-click for the color mixer Tah: kliknutím otevřete vzorník, Shift+kliknutím míchání barev
This panel is on the roadmap (see the parity plan). Tento panel je v plánu (viz plán parity).
Open a document to navigate it. Otevřete dokument, abyste v něm mohli navigovat.
View Artboard Only Zobrazit jen pracovní plochu
View Artboard Contents Only Zobrazit jen obsah pracovní plochy
Contextual Alternates Kontextové alternativy
Default Figure Výchozí číslice
Discretionary Ligatures Volitelné ligatury
Can't render this file because it is too large.
+1 -1
View File
@@ -4596,7 +4596,7 @@ digits Malayalam Malayalam
Stroke: click for swatches, Shift-click for the color mixer Kontur: klik for farveprøver, Skift-klik for farveblanderen
This panel is on the roadmap (see the parity plan). Dette panel er på vejkortet (se paritetsplanen).
Open a document to navigate it. Åbn et dokument for at navigere i det.
View Artboard Only Vis kun tegnebræt
View Artboard Contents Only Vis kun tegnebrættets indhold
Contextual Alternates Kontekstuelle alternativer
Default Figure Standardcifre
Discretionary Ligatures Valgfrie ligaturer
Can't render this file because it is too large.
+1 -1
View File
@@ -4070,7 +4070,7 @@ effect Points Punkte
Vertical: Vertikal:
Very High Sehr hoch
View Ansicht
View Artboard Only Nur Zeichenfläche anzeigen
View Artboard Contents Only Nur Inhalt der Zeichenfläche anzeigen
View Opacity Mask Deckkraftmaske anzeigen
View PDF after saving PDF nach dem Speichern anzeigen
View {n} Ansicht {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -4626,7 +4626,7 @@ digits Malayalam Μαλαγιάλαμ
Vertical Scale % Κατακόρυφη κλίμακα %
Vertical Type on a Path Tool Κατακόρυφο κείμενο σε διαδρομή (Vertical Type on a Path Tool)
Very High Πολύ υψηλή
View Artboard Only Προβολή μόνο πίνακα σχεδίασης
View Artboard Contents Only Προβολή μόνο του περιεχομένου του πίνακα σχεδίασης
View Opacity Mask Προβολή μάσκας αδιαφάνειας
View PDF after saving Προβολή PDF μετά την αποθήκευση
View {n} Προβολή {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -4157,7 +4157,7 @@ digits Malayalam Malayálam
Vertical: Vertical:
Very High Muy alta
View Ver
View Artboard Only Ver solo la mesa de trabajo
View Artboard Contents Only Ver solo el contenido de la mesa de trabajo
View Opacity Mask Ver máscara de opacidad
View PDF after saving Ver PDF después de guardar
View {n} Vista {n}
Can't render this file because it contains an unexpected character in line 2 and column 73.
+1 -1
View File
@@ -2065,7 +2065,7 @@ digits Malayalam Malajalam
Stroke: click for swatches, Shift-click for the color mixer Viiva: napsauta avataksesi värimallit, Vaihto-napsauta avataksesi värisekoittimen
This panel is on the roadmap (see the parity plan). Tämä paneeli on suunnitteilla (katso yhdenmukaisuussuunnitelma).
Open a document to navigate it. Avaa asiakirja, niin voit liikkua siinä.
View Artboard Only Näytä vain piirtoalusta
View Artboard Contents Only Näytä vain piirtoalustan sisältö
Contextual Alternates Kontekstuaaliset vaihtoehdot
Default Figure Oletusnumerot
Discretionary Ligatures Valinnaiset ligatuurit
Can't render this file because it contains an unexpected character in line 2 and column 73.
+1 -1
View File
@@ -4144,7 +4144,7 @@ digits Malayalam Malayalam
Vertical: Vertical :
Very High Très élevée
View Affichage
View Artboard Only Afficher le plan de travail uniquement
View Artboard Contents Only Afficher uniquement le contenu du plan de travail
View Opacity Mask Afficher le masque d’opacité
View PDF after saving Afficher le PDF après l’enregistrement
View {n} Vue {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -4258,7 +4258,7 @@
Video વિડિયો
Video Ruler Pixel Aspect Ratio: વિડિયો રૂલર પિક્સેલ ગુણોત્તર:
View વ્યૂ
View Artboard Only માત્ર આર્ટબોર્ડ જુઓ
View Artboard Contents Only માત્ર આર્ટબોર્ડની સામગ્રી જુઓ
View Opacity Mask ઓપેસિટી માસ્ક જુઓ
View PDF after saving સાચવ્યા પછી PDF જુઓ
Viewing Angle: જોવાનો ખૂણો:
Can't render this file because it contains an unexpected character in line 72 and column 5.
+1 -1
View File
@@ -5681,7 +5681,7 @@ antiAlias Sharp शार्प
Video Thumbnail 1280×720 वीडियो थंबनेल 1280 × 720
View व्यू
View {n} {n}
View Artboard Only केवल आर्टबोर्ड देखें
View Artboard Contents Only केवल आर्टबोर्ड की सामग्री देखें
View Opacity Mask ओपेसिटी मास्क देखें
View PDF after saving सेव करने के बाद PDF देखें
View: व्यू:
Can't render this file because it is too large.
+1 -1
View File
@@ -4891,7 +4891,7 @@ mark-style Japanese Japán
Video Banner 2560×1440 Videós szalagcím 2560×1440
Video Thumbnail 1280×720 Videó-bélyegkép 1280×720
View Nézet
View Artboard Only Csak a rajztábla látszik
View Artboard Contents Only Csak a rajztábla tartalma látszik
View Opacity Mask Átlátszósági maszk megtekintése
View PDF after saving PDF megtekintése mentés után
View {n} Nézet {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -1861,7 +1861,7 @@ digits Malayalam Malayalam
Stroke: click for swatches, Shift-click for the color mixer Stroke: klik untuk swatch, Shift+klik untuk pencampur warna
This panel is on the roadmap (see the parity plan). Panel ini masih dalam roadmap (lihat rencana paritas).
Open a document to navigate it. Buka dokumen untuk menjelajahinya.
View Artboard Only Tampilkan artboard saja
View Artboard Contents Only Tampilkan isi artboard saja
Contextual Alternates Alternatif kontekstual
Default Figure Angka default
Discretionary Ligatures Ligatur opsional
1 # Indonesian (id) catalog. Same format as zh-hant.tsv: context <TAB> source <TAB> translation
1861
1862
1863
1864
1865
1866
1867
+1 -1
View File
@@ -4204,7 +4204,7 @@ digits Malayalam Malayalam
Vertical: Verticale:
Very High Molto alta
View Visualizza
View Artboard Only Visualizza solo tavola da disegno
View Artboard Contents Only Visualizza solo il contenuto della tavola da disegno
View Opacity Mask Visualizza maschera di opacità
View PDF after saving Visualizza PDF dopo il salvataggio
View {n} Vista {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -3697,7 +3697,7 @@ mark-style Japanese 日本式
Vertical Type Tool 縦書き文字ツール
Vertical Type on a Path Tool 縦書きパス上文字ツール
Vertical: 垂直方向:
View Artboard Only アートボードのみ表示
View Artboard Contents Only アートボードの内容のみ表示
View Opacity Mask 不透明マスクを表示
View PDF after saving 保存後に PDF を表示
Viewing Angle: 視角:
Can't render this file because it is too large.
+1 -1
View File
@@ -3919,7 +3919,7 @@ digits Malayalam მალაიალამური
Stroke: click for swatches, Shift-click for the color mixer კონტური: დაწკაპეთ ფერის ნიმუშებისთვის, Shift-დაწკაპუნებით — ფერის შემრევისთვის
This panel is on the roadmap (see the parity plan). ეს პანელი სამომავლო გეგმაშია (იხ. პარიტეტის გეგმა).
Open a document to navigate it. გახსენით დოკუმენტი მასში სანავიგაციოდ.
View Artboard Only მხოლოდ სამუშაო დაფის ჩვენება
View Artboard Contents Only მხოლოდ სამუშაო დაფის შიგთავსის ჩვენება
Contextual Alternates კონტექსტური ალტერნატივები
Default Figure ნაგულისხმევი ციფრები
Discretionary Ligatures დამატებითი ლიგატურები
Can't render this file because it is too large.
+1 -1
View File
@@ -3686,7 +3686,7 @@ mark-style Japanese 일본식
Vertical Type Tool 세로 문자 도구
Vertical Type on a Path Tool 패스 상의 세로 문자 도구
Vertical: 세로:
View Artboard Only 아트보드만 보기
View Artboard Contents Only 아트보드 내용만 보기
View Opacity Mask 불투명 마스크 보기
View PDF after saving 저장 후 PDF 보기
Viewing Angle: 시야각:
Can't render this file because it is too large.
+1 -1
View File
@@ -2471,7 +2471,7 @@ digits Malayalam Malayalam
Stroke: click for swatches, Shift-click for the color mixer Lijn: klik voor stalen, Shift-klik voor de kleurenmixer
This panel is on the roadmap (see the parity plan). Dit paneel staat op de roadmap (zie het pariteitsplan).
Open a document to navigate it. Open een document om erin te navigeren.
View Artboard Only Alleen tekengebied weergeven
View Artboard Contents Only Alleen inhoud van tekengebied weergeven
Contextual Alternates Contextuele alternatieven
Default Figure Standaardcijfer
Discretionary Ligatures Optionele ligaturen
Can't render this file because it is too large.
+1 -1
View File
@@ -2022,7 +2022,7 @@ digits Malayalam Malajalam
Stroke: click for swatches, Shift-click for the color mixer Obrys: kliknij, aby wybrać próbkę, z Shift — mikser kolorów
This panel is on the roadmap (see the parity plan). Ten panel jest w planach (patrz plan zgodności).
Open a document to navigate it. Otwórz dokument, aby się po nim poruszać.
View Artboard Only Pokaż tylko obszar kompozycji
View Artboard Contents Only Pokaż tylko zawartość obszaru kompozycji
Contextual Alternates Alternatywy kontekstowe
Default Figure Cyfry domyślne
Discretionary Ligatures Ligatury opcjonalne
Can't render this file because it is too large.
+1 -1
View File
@@ -3370,7 +3370,7 @@ digits Malayalam Malaiala
Vertical Type on a Path Tool Ferramenta Texto Vertical em um Caminho
Vertical: Vertical:
View Exibir
View Artboard Only Exibir Somente a Mesa de Trabalho
View Artboard Contents Only Exibir Somente o Conteúdo da Mesa de Trabalho
View Opacity Mask Exibir Máscara de Opacidade
View PDF after saving Exibir PDF após salvar
Viewing Angle: Ângulo de Visualização:
Can't render this file because it is too large.
+1 -1
View File
@@ -4189,7 +4189,7 @@ digits Malayalam Малаялам
Vertical: По вертикали:
Very High Очень высокая
View Просмотр
View Artboard Only Просмотр только монтажной области
View Artboard Contents Only Просмотр только содержимого монтажной области
View Opacity Mask Просмотр непрозрачной маски
View PDF after saving Просматривать PDF после сохранения
View {n} Вид {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -4074,7 +4074,7 @@ digits Malayalam Malayalam
Vertical: Vertikalt:
Very High Mycket hög
View Visa
View Artboard Only Visa endast rityta
View Artboard Contents Only Visa endast ritytans innehåll
View Opacity Mask Visa opacitetsmask
View PDF after saving Visa PDF efter sparning
View {n} Vy {n}
Can't render this file because it is too large.
+14
View File
@@ -570,6 +570,20 @@ fn control_bar_panel_menu_labels_are_in_complete_catalogs() {
}
}
/// The Navigator panel menu's items are in every complete catalog, and no catalog keeps the
/// item's earlier name, View Artboard Only.
#[test]
fn navigator_panel_menu_labels_are_in_complete_catalogs() {
for lang in LANGUAGES.iter().filter(|lang| lang.complete_menus) {
for label in ["View Artboard Contents Only", "Panel Options…"] {
assert!(lang.catalog().plain(label).is_some(), "{} is missing {label}", lang.code);
}
}
for lang in LANGUAGES.iter() {
assert!(lang.catalog().plain("View Artboard Only").is_none(), "{} keeps View Artboard Only", lang.code);
}
}
/// Document Info's labels: every category title, which the panel and its menu show, every count
/// label of the Objects category, and the Document category's fixed row labels (the artboard rows
/// show artboard names and are left out).
+1 -1
View File
@@ -3926,7 +3926,7 @@ digits Malayalam Malayalam
Vertical: Dikey:
Very High Çok Yüksek
View Görünüm
View Artboard Only Yalnızca Çalışma Yüzeyini Görüntüle
View Artboard Contents Only Yalnızca Çalışma Yüzeyi İçeriğini Görüntüle
View Opacity Mask Opaklık Maskesini Görüntüle
View PDF after saving Kaydettikten sonra PDF'yi görüntüle
View {n} {n}'yi görüntüle
Can't render this file because it is too large.
+1 -1
View File
@@ -4197,7 +4197,7 @@ effect Points Точки
Vertical: По вертикалі:
Very High Дуже висока
View Перегляд
View Artboard Only Перегляд лише монтажної області
View Artboard Contents Only Перегляд лише вмісту монтажної області
View Opacity Mask Перегляд маски непрозорості
View PDF after saving Переглядати PDF після збереження
View {n} Вигляд {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -4577,7 +4577,7 @@ mark-style Japanese Kiểu Nhật
Very High Rất cao
Video Video
View Hiển thị
View Artboard Only Chỉ hiển thị bảng vẽ
View Artboard Contents Only Chỉ hiển thị nội dung bảng vẽ
View Opacity Mask Hiển thị mặt nạ độ mờ
View PDF after saving Xem PDF sau khi lưu
View {n} Hiển thị {n}
Can't render this file because it contains an unexpected character in line 205 and column 5.
+1 -1
View File
@@ -4034,7 +4034,7 @@ digits Malayalam 马拉雅拉姆数字
Vertical: 垂直:
Very High 极高
View 视图
View Artboard Only 仅查看画板
View Artboard Contents Only 仅查看画板内容
View Opacity Mask 查看不透明度蒙版
View PDF after saving 存储后查看 PDF
View {n} 查看 {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -5350,7 +5350,7 @@ digits Malayalam 馬來亞拉姆數字
Vertical: 垂直:
Very High 極高
View 檢視
View Artboard Only 僅檢視工作區域
View Artboard Contents Only 僅檢視工作區域內容
View Opacity Mask 檢視不透明度遮色片
View PDF after saving 儲存後檢視 PDF
View {n} 檢視 {n}
Can't render this file because it is too large.
+1 -1
View File
@@ -1098,7 +1098,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
"ui.navigatorPanelOptions",
"Panel Options…",
"",
"{color?: #rrggbb or a preset name (Light Red, the default, then the layer colors such as \"Light Blue\"), solidDashes?: bool (Draw Dashed Lines as Solid Lines, off by default: the Navigator's thumbnail draws dashed strokes without their dashes; the canvas, printing and exports keep them)} set the Navigator panel's options, the color its view box is drawn in and solid dashes (kept with the UI state) → {color, solidDashes}; with neither, open its Panel Options (dialog `navigatorPanelOptions`, fields color, solidDashes; OK sets them); an error for a value that is not a color or not true or false, which changes nothing",
"{color?: #rrggbb or a preset name (Light Red, the default, then the layer colors such as \"Light Blue\"), solidDashes?: bool (Draw Dashed Lines as Solid Lines, off by default: the Navigator's thumbnail draws dashed strokes without their dashes; the canvas, printing and exports keep them), viewArtboardContentsOnly?: bool (View Artboard Contents Only in the panel menu, on by default and for UI state saved without it: the thumbnail fits the artboards and draws only the art inside them, cut at each artboard's edges; off, it also shows the art on the pasteboard)} set the Navigator panel's options, the color its view box is drawn in, solid dashes and artboard contents only (kept with the UI state) → {color, solidDashes, viewArtboardContentsOnly}; with none, open its Panel Options (dialog `navigatorPanelOptions`, fields color, solidDashes; OK sets them); an error for a value that is not a color or not true or false, which changes nothing",
),
(
"ui.layersExpand",
+144 -17
View File
@@ -2,7 +2,8 @@
//! cached by document revision, off the UI thread for heavy documents and not during drags: see
//! [`crate::thumb_worker`]) with the view box you drag to pan, zoom out/in buttons, a zoom slider
//! and a zoom field. Panel Options… sets the view box's color and whether the thumbnail draws
//! dashed lines as solid lines ([`PanelOptions`]).
//! dashed lines as solid lines, and the panel menu's View Artboard Contents Only (on by default)
//! limits the thumbnail to the art inside the artboards ([`PanelOptions`]).
use std::sync::Arc;
@@ -13,7 +14,6 @@ use vectorcraft_color::Color;
use vectorcraft_doc::LAYER_COLORS;
use vectorcraft_geom::{Point, Rect as DRect};
use super::{pstate, set_pstate};
use crate::VectorcraftApp;
use crate::theme::Tokens;
use crate::thumb_worker::{Settle, ThumbWorker};
@@ -39,7 +39,8 @@ pub fn resolve(color: &str) -> Option<[u8; 3]> {
Some([byte(0)?, byte(2)?, byte(4)?])
}
/// Navigator panel options (≡ › Panel Options…), kept with the UI state.
/// Navigator panel options (≡ › Panel Options… and ≡ › View Artboard Contents Only), kept with the
/// UI state.
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
#[serde(default, rename_all = "camelCase")]
pub struct PanelOptions {
@@ -48,12 +49,16 @@ pub struct PanelOptions {
/// Draw Dashed Lines as Solid Lines (off by default): the thumbnail draws dashed strokes
/// without their dashes. The canvas, printing and exports keep the dashes.
pub solid_dashes: bool,
/// View Artboard Contents Only (the panel menu; on by default, and on for UI state saved
/// without it): the thumbnail fits the artboards and draws only the art inside them, cut at
/// each artboard's edges. Off, it also fits and draws the art on the pasteboard.
pub view_artboard_contents_only: bool,
}
impl Default for PanelOptions {
fn default() -> Self {
let [r, g, b] = VIEW_BOX_RED;
Self { color: Color::rgb8(r, g, b).to_hex(), solid_dashes: false }
Self { color: Color::rgb8(r, g, b).to_hex(), solid_dashes: false, view_artboard_contents_only: true }
}
}
@@ -65,11 +70,11 @@ impl PanelOptions {
}
}
/// `ui.navigatorPanelOptions {color?, solidDashes?}`: with neither, open Panel Options on the
/// panel's options; otherwise set the ones given and answer the options.
/// `ui.navigatorPanelOptions {color?, solidDashes?, viewArtboardContentsOnly?}`: with none, open
/// Panel Options on the panel's options; otherwise set the ones given and answer the options.
pub fn set_options(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
let (color, solid) = (p.get("color"), p.get("solidDashes"));
if color.is_none() && solid.is_none() {
let (color, solid, contents_only) = (p.get("color"), p.get("solidDashes"), p.get("viewArtboardContentsOnly"));
if color.is_none() && solid.is_none() && contents_only.is_none() {
return crate::dialogs::navigator_panel_options::open(app);
}
let mut o = app.ui.navigator_panel.clone();
@@ -84,6 +89,10 @@ pub fn set_options(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String>
let key = "solidDashes";
o.solid_dashes = s.as_bool().ok_or_else(|| format!("`{key}` must be true or false"))?;
}
if let Some(v) = contents_only {
let key = "viewArtboardContentsOnly";
o.view_artboard_contents_only = v.as_bool().ok_or_else(|| format!("`{key}` must be true or false"))?;
}
app.ui.navigator_panel = o;
Ok(serde_json::to_value(&app.ui.navigator_panel).unwrap_or_default())
}
@@ -218,10 +227,17 @@ impl Cache {
}
/// How the image `key` names is drawn: as exported (template layers and guides left out),
/// transparent, with images far smaller than they are sampling their mip levels, and with Draw
/// Dashed Lines as Solid Lines, dashed strokes without their dashes.
/// transparent, with images far smaller than they are sampling their mip levels, with Draw
/// Dashed Lines as Solid Lines, dashed strokes without their dashes, and with View Artboard
/// Contents Only, the art cut to the artboards (none in the gaps between them).
fn image_options(key: ImageKey) -> vectorcraft_render::RenderOptions {
vectorcraft_render::RenderOptions { skip_templates: true, image_mips: true, solid_dashes: key.solid_dashes, ..Default::default() }
vectorcraft_render::RenderOptions {
skip_templates: true,
image_mips: true,
solid_dashes: key.solid_dashes,
trim: key.artboard_only,
..Default::default()
}
}
thread_local! {
@@ -296,7 +312,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
super::empty_state(ui, "map", tl!("No document"), tl!("Open a document to navigate it."));
return;
};
let artboard_only: bool = pstate(ui.ctx(), "nav-ab-only");
let artboard_only = app.ui.navigator_panel.view_artboard_contents_only;
let doc = st.doc.clone();
let (uid, revision) = (st.uid, st.revision);
// A drag in progress: every pointer move makes a new revision. The image waits for its end.
@@ -373,9 +389,9 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
}
pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
let ab: bool = pstate(ui.ctx(), "nav-ab-only");
if menu_item(ui, tl!("View Artboard Only"), true, ab) {
set_pstate(ui.ctx(), "nav-ab-only", !ab);
let ab = app.ui.navigator_panel.view_artboard_contents_only;
if menu_item(ui, tl!("View Artboard Contents Only"), true, ab) {
app.run("ui.navigatorPanelOptions", json!({"viewArtboardContentsOnly": !ab})).ok();
}
if menu_item(ui, tl!("Panel Options…"), true, false) {
app.run("ui.navigatorPanelOptions", json!({})).ok();
@@ -547,7 +563,7 @@ mod tests {
let shown = || CACHE.with(|c| c.borrow().shown.map(|(k, _)| k.solid_dashes));
assert_eq!(shown(), Some(false));
let set = app.run("ui.navigatorPanelOptions", json!({"color": "light blue", "solidDashes": true})).unwrap();
assert_eq!(set, json!({"color": "#4f80ff", "solidDashes": true}));
assert_eq!(set, json!({"color": "#4f80ff", "solidDashes": true, "viewArtboardContentsOnly": true}));
assert_eq!((boxes(&mut app, red), boxes(&mut app, blue)), (0, 1));
for _ in 0..12 {
boxes(&mut app, blue);
@@ -560,11 +576,15 @@ mod tests {
json!({"color": "#f00"}),
json!({"color": null}),
json!({"color": "Red", "solidDashes": "yes"}),
json!({"color": "Red", "viewArtboardContentsOnly": "no"}),
json!({"solidDashes": false, "viewArtboardContentsOnly": 0}),
json!({"viewArtboardContentsOnly": null}),
];
for bad in bad {
assert!(app.run("ui.navigatorPanelOptions", bad.clone()).is_err(), "{bad}");
}
assert_eq!(serde_json::to_value(&app.ui.navigator_panel).unwrap(), json!({"color": "#4f80ff", "solidDashes": true}), "nothing changed");
let want = json!({"color": "#4f80ff", "solidDashes": true, "viewArtboardContentsOnly": true});
assert_eq!(serde_json::to_value(&app.ui.navigator_panel).unwrap(), want, "nothing changed");
app.run("ui.navigatorPanelOptions", json!({"color": "#123456"})).unwrap();
assert!(app.ui.navigator_panel.solid_dashes, "an option left out keeps its value");
}
@@ -600,6 +620,113 @@ mod tests {
assert_eq!(draw(&line(false), on), solid, "a solid stroke draws as it did");
}
/// View Artboard Contents Only is on by default, and on for UI state saved without it, whether
/// the panel's options are missing or saved before the option existed; a saved off stays off.
#[test]
fn view_artboard_contents_only_is_on_by_default_and_a_saved_off_stays_off() {
assert!(PanelOptions::default().view_artboard_contents_only);
let none: crate::UiState = serde_json::from_value(json!({})).unwrap();
assert!(none.navigator_panel.view_artboard_contents_only, "UI state saved without the panel's options");
let older: crate::UiState = serde_json::from_value(json!({"navigator_panel": {"color": "#123456", "solidDashes": true}})).unwrap();
let o = &older.navigator_panel;
assert!(o.view_artboard_contents_only && o.solid_dashes && o.color == "#123456", "options saved before the option existed: {o:?}");
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
assert!(app.ui.navigator_panel.view_artboard_contents_only);
let set = app.run("ui.navigatorPanelOptions", json!({"viewArtboardContentsOnly": false})).unwrap();
assert_eq!(set, json!({"color": "#ff3030", "solidDashes": false, "viewArtboardContentsOnly": false}));
let back: crate::UiState = serde_json::from_value(serde_json::to_value(&app.ui).unwrap()).unwrap();
assert!(!back.navigator_panel.view_artboard_contents_only, "a saved off stays off");
}
/// The panel menu's View Artboard Contents Only starts checked, and a click turns it off (the
/// same option `ui.navigatorPanelOptions` sets), then on again.
#[test]
fn view_artboard_contents_only_is_checked_in_the_panel_menu_and_a_click_toggles_it() {
use crate::widgets::accessibility_tests::{named, tree};
let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
named(&tree(|ui| menu(&mut app, ui)), "✓ View Artboard Contents Only");
let ctx = egui::Context::default();
let screen = Some(Rect::from_min_size(pos2(0.0, 0.0), vec2(240.0, 400.0)));
let raw = |events| egui::RawInput { events, screen_rect: screen, ..Default::default() };
let click = |app: &mut VectorcraftApp| {
let mut out = ctx.run_ui(raw(vec![]), |ui| menu(app, ui));
out.textures_delta.clear();
let item = out
.shapes
.iter()
.find_map(|c| match &c.shape {
egui::Shape::Text(t) if t.galley.text().ends_with("View Artboard Contents Only") => Some(t.visual_bounding_rect().center()),
_ => None,
})
.expect("the menu item");
let button =
|pressed| egui::Event::PointerButton { pos: item, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
ctx.run_ui(raw(vec![egui::Event::PointerMoved(item), button(true), button(false)]), |ui| menu(app, ui)).textures_delta.clear();
};
click(&mut app);
assert!(!app.ui.navigator_panel.view_artboard_contents_only, "a click turns it off");
named(&tree(|ui| menu(&mut app, ui)), " View Artboard Contents Only");
click(&mut app);
assert!(app.ui.navigator_panel.view_artboard_contents_only, "a second click turns it on");
}
/// With View Artboard Contents Only the thumbnail draws only the art inside the artboards: a
/// shape in the gap between two artboards is left out and one that crosses an artboard's edge
/// is cut there. Without it both draw.
#[test]
fn the_thumbnail_draws_only_the_art_inside_the_artboards_with_the_option() {
use vectorcraft_color::Paint;
use vectorcraft_doc::{Appearance, Document, Node};
let mut d = Document::new(100.0, 100.0);
let mut second = d.artboards[0].clone();
second.id = d.artboards.iter().map(|a| a.id).max().unwrap_or(0) + 1;
second.rect = DRect::new(150.0, 0.0, 250.0, 100.0);
d.artboards.push(second);
let l = d.layers[0].id;
for (x0, y0, x1, y1) in [(110.0, 20.0, 140.0, 80.0), (20.0, 80.0, 60.0, 130.0)] {
let mut bp = vectorcraft_geom::BezPath::new();
bp.move_to((x0, y0));
bp.line_to((x1, y0));
bp.line_to((x1, y1));
bp.line_to((x0, y1));
bp.close_path();
let id = d.alloc_id();
let n = Node::path(id, vectorcraft_geom::PathData::from_bezpath(&bp), Appearance::basic(Paint::solid(Color::BLACK), Paint::None, 0.0));
d.insert(Some(l), 0, n).unwrap();
}
let alpha = |artboard_only: bool, x: u32, y: u32| {
let key = ImageKey { uid: 1, revision: 1, w: 260, h: 140, artboard_only, solid_dashes: false };
vectorcraft_render::Renderer::new().render_region_with(&d, DRect::new(0.0, 0.0, 260.0, 140.0), 1.0, &image_options(key)).pixel(x, y)[3]
};
assert_eq!([alpha(true, 125, 50), alpha(true, 40, 90), alpha(true, 40, 120)], [0, 255, 0], "the gap and below the artboard are empty");
assert_eq!([alpha(false, 125, 50), alpha(false, 40, 90), alpha(false, 40, 120)], [255, 255, 255], "all the art draws");
}
/// Turning View Artboard Contents Only off makes the thumbnail again, fitted to the art on the
/// pasteboard as well as the artboards; turning it on fits it to the artboards again.
#[test]
fn the_thumbnail_is_made_again_when_view_artboard_contents_only_changes() {
use vectorcraft_engine::Session;
let mut app = VectorcraftApp::new(Session::new(), Default::default());
app.session.execute("file.new", &json!({"width": 200, "height": 200})).unwrap();
app.session.execute("shape.rectangle", &json!({"x": 400, "y": 50, "width": 50, "height": 50})).unwrap();
let ctx = egui::Context::default();
let frames = |app: &mut VectorcraftApp| {
for _ in 0..12 {
let mut out = ctx.run_ui(egui::RawInput::default(), |ui| show(app, ui));
out.textures_delta.clear();
}
CACHE.with(|c| c.borrow().shown.map(|(k, r)| (k.artboard_only, r.x1)))
};
let Some((true, right)) = frames(&mut app) else { panic!("an image of the artboards only") };
assert!(right < 300.0, "fitted to the artboard: {right}");
app.run("ui.navigatorPanelOptions", json!({"viewArtboardContentsOnly": false})).unwrap();
let Some((false, right)) = frames(&mut app) else { panic!("an image with the pasteboard's art") };
assert!(right > 450.0, "fitted to the art on the pasteboard too: {right}");
app.run("ui.navigatorPanelOptions", json!({"viewArtboardContentsOnly": true})).unwrap();
assert!(matches!(frames(&mut app), Some((true, r)) if r < 300.0));
}
#[test]
fn zoom_slider_roundtrip() {
assert!((zoom_to_slider(3.13)).abs() < 1e-9);
+2 -1
View File
@@ -850,7 +850,8 @@ pub struct UiState {
/// Layers panel › Panel Options… (row size, thumbnails, Show Layers Only, Locate Selected Objects).
#[serde(default)]
pub layers_panel: crate::panels::layers::PanelOptions,
/// Navigator panel › Panel Options… (the view box color, Draw Dashed Lines as Solid Lines).
/// Navigator panel › Panel Options… (the view box color, Draw Dashed Lines as Solid Lines) and
/// the panel menu's View Artboard Contents Only.
#[serde(default)]
pub navigator_panel: crate::panels::navigator::PanelOptions,
/// The Layers panel's Filter (`ui.layersFilter`). It is not saved and lasts the session, as the
+15 -5
View File
@@ -3139,16 +3139,26 @@ dropped.
## Navigator panel options
The Navigator panel menu's Panel Options… opens the `navigatorPanelOptions` dialog (fields `color`, `solidDashes`),
and `ui.navigatorPanelOptions {color?, solidDashes?}` sets the options without it → `{color, solidDashes}`; with
neither key it opens the dialog. `color` is the color the panel's view box is drawn in: `#rrggbb` or a preset name.
and `ui.navigatorPanelOptions {color?, solidDashes?, viewArtboardContentsOnly?}` sets the options without it →
`{color, solidDashes, viewArtboardContentsOnly}`; with none of the keys it opens the dialog. `color` is the color the
panel's view box is drawn in: `#rrggbb` or a preset name.
The presets are VectorCraft's own list: Light Red (`#ff3030`, the default), then the layer colors ("Light Blue",
"Red", "Green" and the rest). `solidDashes` (Draw Dashed Lines as Solid Lines, off by default) makes the panel's
thumbnail draw dashed strokes without their dashes; the canvas, printing and exports keep the dashes. Both are kept
with the UI state. A `color` that is not a color, or a `solidDashes` that is not true or false, is an error and
changes neither option. Behavior reference: [View artwork](https://helpx.adobe.com/illustrator/using/viewing-artwork.html).
thumbnail draw dashed strokes without their dashes; the canvas, printing and exports keep the dashes.
`viewArtboardContentsOnly` is the panel menu's View Artboard Contents Only, on by default: the thumbnail fits the
artboards and draws only the art inside them, so art on the pasteboard and in the gaps between artboards is left out
and a shape that crosses an artboard's edge is cut there. Off, the thumbnail also fits and draws the art outside the
artboards. The view box still shows the canvas's view either way. All three are kept with the UI state and apply to
every document; UI state saved without `viewArtboardContentsOnly` reads it as on, and a saved off stays off. Fitting
the thumbnail to the union of the artboards with a small margin, cutting the art at each artboard, and keeping the
choice with the UI state are VectorCraft's own rules. A `color` that is not a color, or a `solidDashes` or
`viewArtboardContentsOnly` that is not true or false, is an error and changes none of the options. Behavior
references: [View artwork](https://helpx.adobe.com/illustrator/using/viewing-artwork.html) and
[Navigate and zoom artwork](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/navigate-and-zoom-artwork.html).
```json
{"name":"invoke_menu","arguments":{"command":"ui.navigatorPanelOptions","params":{"color":"Light Blue","solidDashes":true}}}
{"name":"invoke_menu","arguments":{"command":"ui.navigatorPanelOptions","params":{"viewArtboardContentsOnly":false}}}
```
## Info panel
+1
View File
@@ -1360,6 +1360,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
- **Artboard click-to-fit (#1227):** a plain click fits the topmost editable object or group to a new artboard, including its stroke like Fit to Selected Art, and makes the new artboard active. Art and its selection stay unchanged; creation is one undo step. Handles, modified clicks, drags, Escape and tool changes retain their meaning. Tested inside an artboard and on the pasteboard (`crates/engine/tests/it/artboard_click.rs`); the public [CS6 Printing Guide](https://helpx.adobe.com/content/dam/help/en/indesign/pdf/CS6_PrintGuide.pdf) documents the object-click gesture. This legacy gesture adds evidence without regrading the 2026 canvas controls.
- **Rotated views:** with the view rotated, Fit Artboard in Window, Fit All in Window and the status bar's artboard navigator fit the artboard or the art as the view turns it, and a Zoom tool marquee (Animated Zoom or GPU Performance off) zooms to the area dragged across. Ruler guides on no artboard turn with the view. The canvas draws the selection marquee where the tools select, Show Hidden Characters draws the marks of type partly inside the canvas, the Contextual Task Bar stays under the selection, and the Navigator's red box outlines what the window shows.
- **Navigator panel options:** the Navigator panel menu's Panel Options… sets the color the view box is drawn in, from a preset list (VectorCraft's own: Light Red, the default, then the layer colors) or a custom color, and Draw Dashed Lines as Solid Lines, off by default, which draws dashed strokes without their dashes in the panel's thumbnail only (`ui.navigatorPanelOptions`; kept with the UI state; behavior reference: [View artwork](https://helpx.adobe.com/illustrator/using/viewing-artwork.html)).
- **Navigator View Artboard Contents Only:** the Navigator panel menu's View Artboard Contents Only is on by default, and the thumbnail then shows only the art inside the artboards, with art on the pasteboard and in the gaps between artboards left out; turning it off shows the art outside the artboards too (`ui.navigatorPanelOptions {viewArtboardContentsOnly}`; kept with the UI state, read as on when it was never saved; the fit to the artboards' union and the cut at each artboard's edge are VectorCraft's own rules; behavior references: [Navigate and zoom artwork](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/navigate-and-zoom-artwork.html), [View artwork](https://helpx.adobe.com/illustrator/using/viewing-artwork.html)).
- **Views:** the status bar's artboard navigator (first, previous, next, last; `view.goToArtboard`) goes to an artboard, fits it and synchronizes the Artboard tool selection when that tool is active; ordinary object selection is preserved. Its four buttons are also commands of their own (`view.firstArtboard`, `view.previousArtboard`, `view.nextArtboard`, `view.lastArtboard`), listed in Edit › Keyboard Shortcuts without a default key, so a user can give them keys such as Page Up and Page Down (#5218). Actual Next-button regressions cover keyboard/Properties deletion and Undo in `chrome.rs`. Fit Artboard in Window and Actual Size show the navigator's artboard. The Artboards panel highlights that active artboard: clicking a row makes it active (the Artboard tool's too, while it is chosen) as does clicking an artboard with the Artboard tool, double-clicking its number also fits it in the window and double-clicking its name renames it. Duplicate Artboards, or a row dragged onto New Artboard, copies the artboard with its art (#446). Escape leaves Presentation Mode, `view.screenMode` from it goes back to Normal Screen Mode, and the screen mode isn't saved with the preferences: the app always starts in Normal Screen Mode with its menus and panels (#472). View › Pixel Preview shows the art as the document pixels it rasterizes to, one per point and hard-edged when magnified, turning with a rotated view (it used to draw the smooth vectors, with only the pixel grid over them). In Outline view a template layer keeps drawing in Preview, dimmed, so a picture placed to be traced stays visible under the outlines (#1505, fixes #1486). Outline view draws on a white canvas in every interface brightness and Canvas Color, pasteboard included, with the artboards as their edges and no paper (VectorCraft's own rule), so the black outlines of art on the pasteboard show.
In Presentation Mode, → and ← go to the next and the previous artboard, and a click anywhere goes to the next one, as the status bar navigator's Next and Previous do (`view.goToArtboard`): on the last artboard → and a click leave the view as it is, and so does ← on the first. The arrow keys do not move the selection there, and the tool does not receive a click, so a click selects and draws nothing (behavior reference: [View artwork](https://helpx.adobe.com/illustrator/using/viewing-artwork.html)).
Full Screen Mode and Presentation Mode put the window full screen, covering the taskbar and the window's frame, and Normal Screen Mode or Full Screen Mode with Menu Bar puts it back (#4365); a window the user made full screen stays so.