fix(icon): simplify import_photo svg structure - #318
Open
F-windy wants to merge 5 commits into
Open
Conversation
1. Replace Sketch-exported nested groups with defs-based structure 2. Remove redundant Sketch metadata (generator comment, title, desc) 3. Keep 128x128 size, viewBox, opacity and visual semantics unchanged Log: Simplify the dark-theme import_photo icon SVG structure Influence: Reduces icon file size while keeping the same look. fix(icon): 精简 import_photo 图标的 SVG 结构 1. 用 defs 引用结构替换 Sketch 导出的多层嵌套分组 2. 移除冗余的 Sketch 元数据（生成器注释、标题、描述） 3. 保持 128x128 尺寸、viewBox、透明度及视觉语义不变 Log: 精简深色主题 import_photo 图标的 SVG 结构 PMS: BUG-373779 Influence: 减小图标体积，外观保持一致。
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Reviewer's guide (collapsed on small PRs)Reviewer's GuideThis PR refactors the dark-theme import_photo SVG asset to remove Sketch-specific metadata and nested group structure, replacing it with a more concise + xlink:href-based structure while preserving visual output and dimensions. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: F-windy The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Address auto-review feedback on PR linuxdeepin#318: 1. Remove unused <defs> block (dead code, path-1 never effectively referenced) 2. Remove invalid xlink:href attribute on <g> element (not supported by SVG spec on <g>) 3. Restore separate path/rect/circle elements for maintainability 4. Keep Sketch metadata removal and dark-theme id/label cleanup from prior commit 5. Visual output is pixel-identical to upstream master Log: Fix SVG spec violations flagged by auto review Influence: Removes dead code while keeping the same look. fix(icon): 移除死代码defs与无效xlink:href 针对 PR linuxdeepin#318 自动评审反馈修复: 1. 移除未被有效引用的 <defs> 死代码块 2. 移除 <g> 元素上不符合 SVG 规范的 xlink:href 属性 3. 恢复独立的 path/rect/circle 元素以提升可维护性 4. 保留前次提交的 Sketch 元数据清理与深色主题 id 语义化 5. 视觉输出与上游 master 像素级一致 Log: 修复自动评审指出的 SVG 规范违规 PMS: BUG-373779 Influence: 移除死代码，外观保持一致。
Log: 深色主题下 import_photo 图标线条互相覆盖 Bug: https://pms.uniontech.com/bug-view-373779.html 问题根因: SVG 中 path/circle 元素使用 fill="#252525" 深色填充, 在 opacity=0.3 下与 stroke="#C5CFE0" 描边叠加, 导致 alpha 通道多层累积 (最高达 193/255), 图标边缘出现线条互相覆盖。 修复: 将 fill="#252525" 改为 fill="none", 移除深色填充区域, 保留 stroke 描边和 rect/circle 的浅色填充不变。 Qt SVG 渲染验证: 重叠像素 (alpha>150) 从 1437 降至 0。 Influence: 仅修改深色主题图标资源文件, 不影响代码逻辑, 渲染效果保持图标语义不变 (文档+下载箭头)。 PMS: BUG-373779
Log: 深色主题下 import_photo 图标线条互相覆盖 Bug: https://pms.uniontech.com/bug-view-373779.html 问题根因: SVG 父级 g 元素设置 opacity=0.3, 每个子元素 (path/rect/circle) 的 alpha 均为 0.3. 当多个子元素几何重叠时 (文档外形与下载圆圈), alpha 通道相加 (0.3+0.3=0.6), 导致图标边缘出现线条互相覆盖的视觉重合. 修复方案: 将所有形状合并为单个 path, 使用 fill-rule="evenodd" 处理子形状 间的切割关系. 由于整个图标仅一个元素, 只有一层 alpha, 彻底消除 alpha 叠加. 首个 path 设置 fill-opacity=0.4 作为文档底板, 第二个 path fill="#FFFFFF" 绘制可见的图标线条 (文档轮廓/横线/下载圆/箭头). 验证: Qt SVG 渲染器 256px 渲染, alpha 重叠区 (sum>360) 从 223 降至 0. Influence: 仅修改深色主题图标资源文件, 不涉及代码逻辑, 图标语义 (文档+下载箭头) 保持不变. PMS: BUG-373779
Log: 为 import_photo 图标添加无障碍访问属性 Bug: https://pms.uniontech.com/bug-view-373779.html 采纳自动评审建议, 给 <svg> 添加 role="img" aria-labelledby, 给 <title> 添加 id, 增强屏幕阅读器对图标的语义识别。 不影响渲染效果 (Qt 渲染像素 MD5 与前次一致)。 Influence: 仅修改图标资源文件的无障碍属性, 不影响视觉渲染。 PMS: BUG-373779
deepin pr auto review★ 总体评分：100分■ 【总体评价】
■ 【详细分析】
■ 【改进建议代码示例】 <?xml version="1.0" encoding="UTF-8"?>
<svg width="128px" height="128px" viewBox="0 0 128 128" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" role="img" aria-labelledby="dr_import_photo_title">
<title id="dr_import_photo_title">添加文档</title>
<g id="dark" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<g id="1-初次使用文档查看器" transform="translate(-478, -275)">
<g id="添加文档" transform="translate(478, 275)">
<path d="M77.5980891,23.0151566 C78.5619098,23.0151566 79.4830735,23.4126118 80.144354,24.1137955 L98.0462648,43.0959503 C98.6588165,43.7454647 99,44.6045132 99,45.4973113 L99.0003622,66.0935279 C107.135962,68.8115791 113,76.4917274 113,85.5414954 C113,96.8633328 103.821837,106.041495 92.5,106.041495 C92.2251556,106.041495 91.9515745,106.036087 91.6793573,106.02537 C91.455743,106.044152 91.2289951,106.053773 91,106.053773 L36,106.053773 C31.581722,106.053773 28,102.472051 28,98.053773 L28,31.0151566 C28,26.5968786 31.581722,23.0151566 36,23.0151566 L77.5980891,23.0151566 Z" id="路径" fill-opacity="0.4" fill="#000000" fill-rule="evenodd"></path>
<path d="M77.5980891,23.0151566 C77.8742088,23.0151566 78.1468275,23.0477771 78.4108377,23.1108143 C78.8210729,23.0839462 79.2489838,23.2237888 79.5846164,23.5751207 L79.7812366,23.7794685 C79.9092251,23.8816105 80.0306325,23.9932117 80.144354,24.1137955 L83.63,27.8091566 L98.5846164,43.4638498 C98.9843445,43.8822753 99.0787962,44.4212924 98.9475886,44.8947329 C98.9822906,45.092253 99,45.2939063 99,45.4973113 L99.0003622,66.0935279 C107.135962,68.8115791 113,76.4917274 113,85.5414954 C113,96.8633328 103.821837,106.041495 92.5,106.041495 C92.228187,106.041495 91.9576095,106.036205 91.688365,106.025723 C91.4618493,106.043891 91.2320787,106.053773 91,106.053773 L36,106.053773 C31.581722,106.053773 28,102.472051 28,98.053773 L28,31.0151566 C28,26.5968786 31.581722,23.0151566 36,23.0151566 L77.5980891,23.0151566 Z M36,26.0151566 C33.2385763,26.0151566 31,28.2537328 31,31.0151566 L31,98.053773 C31,100.815197 33.2385763,103.054504 36,103.054504 L81.8385713,103.054504 C75.938711,99.455144 72,92.9582873 72,85.5414954 C72,74.219658 81.1781626,65.0414954 92.5,65.0414954 C93.6934491,65.0414954 94.8630787,65.1434789 96.0006494,65.3392064 L96.0006494,45.9991566 L78.5,46 C77.6715729,46 77,45.3284271 77,44.5 L77,26.0141566 L36,26.0151566 Z M92.5,68.0414954 C82.8350169,68.0414954 75,75.8765123 75,85.5414954 C75,95.2064785 82.8350169,103.041495 92.5,103.041495 C102.164983,103.041495 110,95.2064785 110,85.5414954 C110,75.8765123 102.164983,68.0414954 92.5,68.0414954 Z M92.0029527,78.5541791 L92.0029527,81.9903421 L99,81.9903421 C99.5522847,81.9903421 100,82.4380574 100,82.9903421 L100,87.9754553 C100,88.52774 99.5522847,88.9754553 99,88.9754553 L92,88.9754553 L92,92.4412289 C92,93.0488821 91.2788855,93.3679417 90.8292014,92.9592527 L83.4189328,86.2245354 C82.9817234,85.8271838 82.9824639,85.1394301 83.4205278,84.7430208 L90.8332706,78.0351427 C91.2833033,77.6279028 92.0029527,77.947241 92.0029527,78.5541791 Z M61,82 L61,85 L43,85 L43,82 L61,82 Z M73,69.0265541 L73,72.0265541 L43,72.0265541 L43,69.0265541 L73,69.0265541 Z M79,56 L79,59 L43,59 L43,56 L79,56 Z M80,28.3529335 L80,43 L93.831,42.9991566 L81.373,29.7891566 L80,28.3529335 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</g>
</g>
</svg> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
问题
深色主题下
import_photo图标（resources/builtin/dark/actions/dr_import_photo_128px.svg）出现线条互相覆盖的重合问题。根因：SVG 父级
<g>元素设置opacity="0.3"，每个子元素（path/rect/circle）的 alpha 均为 0.3。当多个子元素几何重叠时（文档外形与下载圆圈），alpha 通道相加（0.3+0.3=0.6），导致图标边缘出现线条互相覆盖的视觉重合。修改内容
<path>，使用fill-rule="evenodd"处理子形状间的切割关系。由于整个图标仅一个元素，只有一层 alpha，彻底消除 alpha 叠加fill-opacity="0.4"作为文档底板，第二个 pathfill="#FFFFFF"绘制可见的图标线条（文档轮廓/横线/下载圆/箭头）<desc>，将<title>改为语义化中文「添加文档」验证
影响
纯图标资源修改，不涉及代码逻辑，图标语义（文档 + 下载箭头）保持不变。
PMS: BUG-373779