diff --git a/ivette/src/dome/renderer/controls/gallery.json b/ivette/src/dome/renderer/controls/gallery.json index 719e0b838040aa67305e87be0730254a02810214..efae6ebd9938395b4f9028873133d3e3c4689b80 100644 --- a/ivette/src/dome/renderer/controls/gallery.json +++ b/ivette/src/dome/renderer/controls/gallery.json @@ -325,6 +325,18 @@ "viewBox": "0 0 16 16", "path": "M16 0h-6.5l2.5 2.5-3 3 1.5 1.5 3-3 2.5 2.5z M16 16v-6.5l-2.5 2.5-3-3-1.5 1.5 3 3-2.5 2.5z M0 16h6.5l-2.5-2.5 3-3-1.5-1.5-3 3-2.5-2.5z M0 0v6.5l2.5-2.5 3 3 1.5-1.5-3-3 2.5-2.5z" }, + "CHEVRON.CONTRACT": { + "section": "Arrows", + "title": "Chevron.contract", + "viewBox": "0 0 16 16", + "path": "M3.646 13.854a.5.5 0 0 0 .708 0L8 10.207l3.646 3.647a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 0 0 0 .708zm0-11.708a.5.5 0 0 1 .708 0L8 5.793l3.646-3.647a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 0-.708z" + }, + "CHEVRON.EXPAND": { + "section": "Arrows", + "title": "Chevron.expand", + "viewBox": "0 0 16 16", + "path": "M3.646 9.146a.5.5 0 0 1 .708 0L8 12.793l3.646-3.647a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 0-.708zm0-2.292a.5.5 0 0 0 .708 0L8 3.207l3.646 3.647a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 0 0 0 .708z" + }, "MEDIA.PREV": { "section": "Media", "title": "Previous", diff --git a/ivette/src/frama-c/kernel/ASTview.tsx b/ivette/src/frama-c/kernel/ASTview.tsx index fa1c851a6f28b416364c82c7b7c6b45843bf5c22..6b1dd2729ad37bfe83625c86348ccb366d53ca4f 100644 --- a/ivette/src/frama-c/kernel/ASTview.tsx +++ b/ivette/src/frama-c/kernel/ASTview.tsx @@ -35,7 +35,7 @@ import { IconButton } from 'dome/controls/buttons'; import type { key } from 'dome/data/json'; import { RichTextBuffer } from 'dome/text/buffers'; import { Text } from 'dome/text/editors'; -import { Hfill } from 'dome/layout/boxes'; +import { Filler, Inset } from 'dome/frame/toolbars'; import * as Preferences from 'ivette/prefs'; @@ -336,19 +336,22 @@ export default function ASTview(): JSX.Element { return ( <> <TitleBar> - <Hfill /> + <Filler /> <IconButton - icon='ANGLE.RIGHT' + icon='CHEVRON.CONTRACT' visible={true} onClick={foldAll} title='Collapse all multi-line ACSL properties' + className="titlebar-thin-icon" /> <IconButton - icon='ANGLE.DOWN' + icon='CHEVRON.EXPAND' visible={true} onClick={unfoldAll} title='Expand all multi-line ACSL properties' + className="titlebar-thin-icon" /> + <Inset /> </TitleBar> <Text buffer={buffer} diff --git a/ivette/src/frama-c/kernel/style.css b/ivette/src/frama-c/kernel/style.css index 9b5d8f34ae951f23a7dd5595cb6267ef8d63b870..2ef1b533826dc78c29cf4fc7b15034a6854b4dbf 100644 --- a/ivette/src/frama-c/kernel/style.css +++ b/ivette/src/frama-c/kernel/style.css @@ -47,6 +47,11 @@ background: var(--code-bullet); } +/* More contrasted color for thinner icons. */ +.titlebar-thin-icon { + fill: var(--text); +} + /* -------------------------------------------------------------------------- */ /* --- Globals --- */ /* -------------------------------------------------------------------------- */