fix(icons): orange ground and white mark, as the product has always been
Reported: "你改的标注应用图标不对啊,我之前是橙底、白线的风格(参考 squid 的 图标)." The previous commit inverted the figure/ground relationship. Chasing consistency with the alpha-only tray mark, the app tile went to espresso with a warm mark — technically consistent geometry, and it passed every contrast check I ran, but those checks were pointed at the wrong axis. Consistency has two of them here, geometry and light/dark, and the one a returning user actually recognises is "orange tile". Now the app icon is literally the tray mark with a colour turned on: `#FF6B35` ground, which is the orange this project's own master already carried, and `#FFF4EA` mark, the cream the app's panels are drawn on. The plus stays a punched hole showing the ground rather than a third colour, so both icons are one drawing on two different grounds. Two colours also removes the failure mode the last version needed a rule to defend. Tray PNG is byte-identical again; the .ico ladder (16/24/32/48/64/256) and .icns entry set are unchanged, and every tracked PNG still matches its committed dimensions. Co-Authored-By: Codex <noreply@openai.com>main
|
|
@ -1,6 +1,6 @@
|
|||
<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect x="102" y="102" width="820" height="820" rx="182.58" fill="#37221A"/>
|
||||
<g fill="#FFB25C">
|
||||
<rect x="102" y="102" width="820" height="820" rx="182.58" fill="#FF6B35"/>
|
||||
<g fill="#FFF4EA">
|
||||
<path d="M526.79 186.34 A326.00 326.00 0 0 1 786.64 336.36 L663.77 414.94 A180.16 180.16 0 0 0 520.17 332.03 Z"/>
|
||||
<path d="M801.43 361.97 A326.00 326.00 0 0 1 801.43 662.03 L671.95 594.91 A180.16 180.16 0 0 0 671.95 429.09 Z"/>
|
||||
<path d="M786.64 687.64 A326.00 326.00 0 0 1 526.79 837.66 L520.17 691.97 A180.16 180.16 0 0 0 663.77 609.06 Z"/>
|
||||
|
|
@ -8,6 +8,6 @@
|
|||
<path d="M222.57 662.03 A326.00 326.00 0 0 1 222.57 361.97 L352.05 429.09 A180.16 180.16 0 0 0 352.05 594.91 Z"/>
|
||||
<path d="M237.36 336.36 A326.00 326.00 0 0 1 497.21 186.34 L503.83 332.03 A180.16 180.16 0 0 0 360.23 414.94 Z"/>
|
||||
</g>
|
||||
<circle cx="512" cy="512" r="108.09" fill="#F04F24"/>
|
||||
<path d="M445.08 512H578.92M512 445.08V578.92" stroke="#37221A" stroke-width="24.02"/>
|
||||
<circle cx="512" cy="512" r="108.09" fill="#FFF4EA"/>
|
||||
<path d="M445.08 512H578.92M512 445.08V578.92" stroke="#FF6B35" stroke-width="24.02"/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
|
@ -565,14 +565,18 @@ cd src-tauri && cargo test --lib update::
|
|||
同一句反馈的后半段是"应用图标要和当前的单色图标保持一致设计"。这句话的重点在**设计**,
|
||||
不在**单色**:托盘那张必须是黑白的,因为它由系统着色;应用图标该是彩色的,因为 Dock
|
||||
瓦片背后没有任何东西给它着色。真正让两张图标成为同一个作品的,是几何和填充规则,不是
|
||||
颜色。所以两者由 `scripts/build-icons.py` 里的同一组常数画出来
|
||||
颜色。
|
||||
|
||||
第一次改错了方向:为了“和单色标记一致”,把应用图标做成**深咖啡底 + 暖色图**,
|
||||
等于把橙底白图整个翻转。深浅两种桌面都验过、对比度也算过,所以不是没检查,而是检查错了
|
||||
对象——一致性有两条轴(几何 / 明暗关系),当时只对齐了几何那条,而用户认得的是“橙色底”。
|
||||
所以两者由 `scripts/build-icons.py` 里的同一组常数画出来
|
||||
(`OUTER`/`INNER`/`HUB`/`GAP`/`PLUS_ARM`/`PLUS_BAR`),只有背后允许出现的东西不同。
|
||||
|
||||
| 约束 | 原因 |
|
||||
| --- | --- |
|
||||
| 一致性来自几何与**平涂**,不来自配色 | 六块扇形、同样的扇区间隙角、同样的内外环与 hub 半径、加号同样是从 hub 里**挖**出来的负空间,以及同样一律平涂。旧图标之所以像另一个产品,不是因为它有颜色,而是因为它是一整块橙紫渐变底 + 径向高光 + 投影 + 六块扇形各配一种奶油色——那是另一套视觉语言。 |
|
||||
| 应用图标最多三色,且不得出现渐变/高光/投影/逐扇形配色 | 加了第三色(hub 用 `#f04f24`)仍然守得住,因为它是平涂;一旦加回渐变就立刻回到旧语言。色相全部取自界面本身:`#FFB25C` 是旧母版本来就带的暖色,`#f04f24` 是界面里每个按钮的强调色。 |
|
||||
| hub 深、外环浅的**朝向**不要反过来 | 被替换的那版就是"暖色 hub 在更浅的圆盘里"。Dock 图标换代时把内外反转,老用户会觉得图标被换掉了,而不只是被重画了。 |
|
||||
| **橙底白图**,只有两色,且不得出现渐变/高光/投影/逐扇形配色 | 这条就是反馈最初的原话:“我之前是橙底、白线的风格”。底色 `#FF6B35` 取自本项目自己的母版,图色 `#FFF4EA` 取自界面的面板奶油色;加号是挖出来的洞、透出底色,而不是第三色。这样应用图标与托盘标记是**同一张图**,只是各自换了底色。 |
|
||||
| 环形几何只在 `scripts/build-icons.py` 定义一次 | 托盘那张 PNG 是用它逐字节重绘出来的(改完脚本跑一遍,产物与仓库里的文件 `cmp` 相同)。几何分两处写就会漂移,而漂移只在 16px 下看得出来。 |
|
||||
| SVG 母版里的瓦片是**内缩**的(820/1024) | `tauri icon` 只会等比缩放母版,**不会**加边距。母版画成满幅,产出的 `icon.png` 就是满幅方块,而仓库里原有的整组图标是 410/512=0.801 的圆角瓦片。 |
|
||||
| 轮盘直径取瓦片的 0.795 | 被替换的那版母版是 r=326 画在 820 的瓦片里(0.795)。照抄这个比例,新图标在 Dock 里的视觉重量和旧的一致,不会突然变大。 |
|
||||
|
|
@ -582,7 +586,7 @@ cd src-tauri && cargo test --lib update::
|
|||
验收看 16px:16px 时轮盘只有约 10px,六条扇区间隙约 0.46px、加号约 0.38px,都已经是
|
||||
亚像素——被替换的那版在 16px 的加号也只有 0.72px,所以这不是退步,而是这套几何在小尺寸
|
||||
下的固有结果。真正必须在 16px 还读得出来的是**外环的扇形分割**和瓦片轮廓,深浅两种桌面
|
||||
下都验过。hub 的 `#f04f24` 要到 24px 才出现像素、48px 才站稳,这是有意的。
|
||||
下都验过。换成两色之后,不存在“某个颜色要到某个尺寸才出现”的问题了。
|
||||
|
||||
`public/shift-icon.png` 是 `icon.png` 的副本,不是另一张图:它在主窗口与编辑器标题栏里以
|
||||
26 CSS px 显示(Retina 上 52 设备 px),那个尺寸下渐变版的中心已经糊成一团,而平涂版的
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
|
|
@ -56,9 +56,13 @@ MASTER = 1024 # the master canvas `tauri icon` downsamples from
|
|||
TILE = 820 # tile edge; the committed icon.png is 410 of 512, i.e. 0.801
|
||||
TILE_CORNER = TILE * 228 / 1024 # same 0.222 corner ratio as the committed set
|
||||
WHEEL_R = 326 # wheel radius in master units
|
||||
WEDGE_INK = "#FFB25C" # the warm amber the old master already carried
|
||||
HUB_INK = "#F04F24" # the accent every button in the app is painted with
|
||||
TILE_INK = "#37221A" # the espresso tile the plus is punched out of
|
||||
# The app icon is the tray mark with its colour turned on: one warm ground, one
|
||||
# cream mark, and the plus left as a hole in the mark so the ground shows through
|
||||
# it. That is the same figure/ground relationship the tray file has, which is what
|
||||
# "consistent design" meant in the request — the tray must be untinted because the
|
||||
# shell colours it, and a Dock tile needs a ground of its own.
|
||||
TILE_INK = "#FF6B35" # the orange this project's own master already carried
|
||||
MARK_INK = "#FFF4EA" # the cream every panel in the app is drawn on
|
||||
|
||||
ROOT = pathlib.Path(__file__).resolve().parent.parent
|
||||
|
||||
|
|
@ -145,15 +149,14 @@ def build_master_svg() -> str:
|
|||
tile sits on the user's wallpaper with nothing behind it, so it needs a
|
||||
ground of its own and gets to be warm.
|
||||
|
||||
Three flat colours and nothing else. No gradient, no drop shadow, no
|
||||
radial shine and no per-wedge pastel tint, because that layered treatment
|
||||
is a different visual language and is exactly why the old rainbow tile and
|
||||
the crisp new mark read as two unrelated products. The hues are the app's
|
||||
own rather than invented for the icon: `#FFB25C` is the tone the previous
|
||||
master already carried and `#F04F24` is the accent every button in the
|
||||
interface is painted with, and keeping the darker warm disc inside the
|
||||
lighter ring preserves which end of the mark is which, so the Dock does not
|
||||
invert on upgrade.
|
||||
Two flat colours and nothing else. No gradient, no drop shadow, no radial
|
||||
shine and no per-wedge pastel tint: that layered treatment is a different
|
||||
visual language, and it is what made the old rainbow tile and the crisp
|
||||
mark read as two unrelated products. The hues are the app's own rather than
|
||||
invented for the icon — `#FF6B35` is the orange this project's master
|
||||
already carried and `#FFF4EA` is the cream its panels are drawn on — and
|
||||
the plus stays a hole rather than a second colour, so the mark sits on the
|
||||
ground exactly the way it sits on the menu bar.
|
||||
|
||||
The plus is drawn in the tile's own colour instead of cut through to
|
||||
transparency: on a Dock tile the two read identically, and a real hole
|
||||
|
|
@ -187,8 +190,8 @@ def build_master_svg() -> str:
|
|||
'fill="none" xmlns="http://www.w3.org/2000/svg">\n'
|
||||
f" <rect x=\"{offset:.0f}\" y=\"{offset:.0f}\" width=\"{TILE}\" height=\"{TILE}\" "
|
||||
f'rx="{TILE_CORNER:.2f}" fill="{TILE_INK}"/>\n'
|
||||
f' <g fill="{WEDGE_INK}">\n' + "\n".join(wedges) + "\n </g>\n"
|
||||
f' <circle cx="{center:.0f}" cy="{center:.0f}" r="{HUB * scale:.2f}" fill="{HUB_INK}"/>\n'
|
||||
f' <g fill="{MARK_INK}">\n' + "\n".join(wedges) + "\n </g>\n"
|
||||
f' <circle cx="{center:.0f}" cy="{center:.0f}" r="{HUB * scale:.2f}" fill="{MARK_INK}"/>\n'
|
||||
f' <path d="M{center - arm:.2f} {center:.0f}H{center + arm:.2f}'
|
||||
f'M{center:.0f} {center - arm:.2f}V{center + arm:.2f}" '
|
||||
f'stroke="{TILE_INK}" stroke-width="{bar:.2f}"/>\n'
|
||||
|
|
@ -221,7 +224,7 @@ def main() -> int:
|
|||
build_tray(args.tray_out)
|
||||
args.master_out.parent.mkdir(parents=True, exist_ok=True)
|
||||
args.master_out.write_text(build_master_svg(), encoding="utf-8")
|
||||
print(f"wrote {_shown(args.master_out)} (flat three-colour master)")
|
||||
print(f"wrote {_shown(args.master_out)} (flat two-colour master)")
|
||||
|
||||
if args.tauri:
|
||||
# Full-bleed would be wrong: `tauri icon` scales the master rather than
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 914 B After Width: | Height: | Size: 859 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 845 B After Width: | Height: | Size: 763 B |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 9.3 KiB After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 524 B After Width: | Height: | Size: 456 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1000 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1000 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 840 B After Width: | Height: | Size: 757 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1000 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.1 KiB |