From 37300e3b79ad6bb96eac01863485a04953a55685 Mon Sep 17 00:00:00 2001
From: Jokul <wangshengshan011@163.com>
Date: Sat, 8 Aug 2026 20:32:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=86=E5=88=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=8C=E4=BD=BF=E6=8E=A5=E5=8F=A3=E5=90=8D?=
 =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E7=94=A8=E6=88=B7=20textColor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将图标+接口名+IPv4 从单 Text 拆分为 RowLayout 内三个独立 Text，
接口名用 primaryText 跟随用户字体色，图标用 tertiaryText、IPv4 用 secondaryText 保持层次
---
 package/components/NetworkPopup.qml | 35 ++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/package/components/NetworkPopup.qml b/package/components/NetworkPopup.qml
index 11210df..e1e56c3 100644
--- a/package/components/NetworkPopup.qml
+++ b/package/components/NetworkPopup.qml
@@ -125,17 +125,32 @@ Control {
             visible: popup.ready
 
             // 行1：类型图标 + 接口名 + · + IPv4
-            Text {
+            // 拆分为独立 Text 元素，使接口名用 primaryText 跟随用户 textColor，
+            // 图标和 IPv4 保持系统主题色（tertiaryText/secondaryText），层次分明
+            RowLayout {
                 Layout.alignment: Qt.AlignHCenter
-                Layout.fillWidth: true
-                horizontalAlignment: Text.AlignHCenter
-                font.pixelSize: Math.round(13 * popup.fontScale)
-                color: popup.secondaryText
-                text: {
-                    var icon = common.interfaceIcon(popup.activeInterface)
-                    var parts = icon + " " + popup.activeInterface
-                    if (popup.ipAddress) parts += "  ·  " + popup.ipAddress
-                    return parts
+                spacing: 4
+
+                // 网卡类型图标：与设置窗口列表图标一致，次要色不抢速度区焦点
+                Text {
+                    text: common.interfaceIcon(popup.activeInterface)
+                    font.pixelSize: Math.round(12 * popup.fontScale)
+                    color: popup.tertiaryText
+                }
+
+                // 接口名：跟随用户 textColor（primaryText），Spec 5.1 节要求
+                Text {
+                    text: popup.activeInterface
+                    font.pixelSize: Math.round(13 * popup.fontScale)
+                    color: popup.primaryText
+                }
+
+                // IPv4 地址：次要色，与接口名区分层次
+                Text {
+                    text: popup.ipAddress ? "·  " + popup.ipAddress : ""
+                    font.pixelSize: Math.round(13 * popup.fontScale)
+                    color: popup.secondaryText
+                    visible: popup.ipAddress !== ""
                 }
             }