refactor: 拆分弹窗到独立组件 NetworkPopup.qml
将 networkview.qml 中 PanelPopup 弹窗内容提取到独立组件 package/components/NetworkPopup.qml，减少主文件约 400 行。 PanelPopup 是 dock 上下文类型，不能作为独立组件根元素，因此 NetworkPopup.qml 用 Control 作为根（只含弹窗内容），由 networkview.qml 的 PanelPopup 壳包裹，定位和可见性管理在壳层处理。
This commit is contained in:
+7
-394
@@ -301,7 +301,8 @@ AppletItem {
|
||||
}
|
||||
}
|
||||
|
||||
// 弹出窗口
|
||||
// 弹出窗口：PanelPopup 壳在此处（dock 上下文类型不能作为独立组件根元素），
|
||||
// 弹窗内容由 NetworkPopup.qml 提供，传入 applet，内部自行派生颜色和数据
|
||||
PanelPopup {
|
||||
id: networkPopup
|
||||
width: 360
|
||||
@@ -310,405 +311,17 @@ AppletItem {
|
||||
popupY: DockPanelPositioner.y
|
||||
|
||||
onPopupVisibleChanged: {
|
||||
// 仅控制 tooltip 关闭，不触发 refresh。
|
||||
// C++ 后端 m_refreshTimer 持续更新，popup 通过属性绑定自动显示最新数据。
|
||||
if (popupVisible) {
|
||||
toolTip.close()
|
||||
// popup 打开时确保活动 chip 完整可见：直接定位不播放动画，避免看到打开瞬间的滚动；
|
||||
// Qt.callLater 等待首次打开时 Repeater 完成实例化与布局后再计算位置
|
||||
Qt.callLater(function() { chipFlickable.scrollToActiveChip(false) })
|
||||
// popup 打开时确保活动 chip 完整可见
|
||||
Qt.callLater(function() { popupContent.scrollToActiveChip(false) })
|
||||
}
|
||||
}
|
||||
|
||||
Control {
|
||||
id: popupContainer
|
||||
NetworkPopup {
|
||||
id: popupContent
|
||||
applet: root.applet
|
||||
anchors.fill: parent
|
||||
padding: 16
|
||||
|
||||
contentItem: ColumnLayout {
|
||||
spacing: 12
|
||||
|
||||
// 标题栏：标题在上，网卡名+IP 在卡片底色背景内
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 72
|
||||
|
||||
ColumnLayout {
|
||||
anchors.centerIn: parent
|
||||
spacing: 6
|
||||
|
||||
Text {
|
||||
text: qsTr("网络速度监控")
|
||||
font.pixelSize: 15
|
||||
font.weight: Font.Bold
|
||||
color: root.primaryText
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
|
||||
// 网卡名 + IP 地址卡片背景
|
||||
Rectangle {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.preferredWidth: 300
|
||||
// 有 IPv6 时增高以容纳第三行；无 IPv6 时保持原 40px
|
||||
Layout.preferredHeight: root.ipv6Address ? 54 : 40
|
||||
color: root.cardBackground
|
||||
radius: 8
|
||||
border.width: 1
|
||||
border.color: root.cardBorder
|
||||
visible: root.ready
|
||||
|
||||
ColumnLayout {
|
||||
anchors.centerIn: parent
|
||||
spacing: 0
|
||||
|
||||
Text {
|
||||
text: root.activeInterface
|
||||
font.pixelSize: 11
|
||||
color: root.secondaryText
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
|
||||
Text {
|
||||
text: root.ipAddress ? qsTr("IPv4：") + root.ipAddress : ""
|
||||
font.pixelSize: 13
|
||||
color: root.secondaryText
|
||||
visible: root.ipAddress !== ""
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
|
||||
// IPv6 全球地址行，无 IPv6 时隐藏不占位
|
||||
Text {
|
||||
text: root.ipv6Address ? qsTr("IPv6：") + root.ipv6Address : ""
|
||||
font.pixelSize: 13
|
||||
color: root.secondaryText
|
||||
visible: root.ipv6Address !== ""
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 实时速度卡片：双列布局，每列内容在各自半区内水平垂直居中
|
||||
// 设计原因：用显式 anchor 分两个等宽半区，比 RowLayout+fillWidth 更可靠，
|
||||
// 确保下载/上传内容各自在左/右半区正中显示
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 110
|
||||
color: root.cardBackground
|
||||
radius: 12
|
||||
border.width: 1
|
||||
border.color: root.cardBorder
|
||||
|
||||
// 下载半区（左半）
|
||||
Item {
|
||||
id: downloadHalf
|
||||
anchors.left: parent.left
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.leftMargin: 12
|
||||
width: (parent.width - 1) / 2 - 12
|
||||
|
||||
ColumnLayout {
|
||||
anchors.centerIn: parent
|
||||
spacing: 4
|
||||
|
||||
Rectangle {
|
||||
width: 32
|
||||
height: 32
|
||||
radius: 16
|
||||
color: root.accentBlueLight
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
|
||||
Text {
|
||||
anchors.centerIn: parent
|
||||
text: "↓"
|
||||
font.pixelSize: 18
|
||||
font.weight: Font.Bold
|
||||
color: root.accentBlue
|
||||
}
|
||||
}
|
||||
|
||||
Text {
|
||||
text: qsTr("下载")
|
||||
font.pixelSize: 11
|
||||
color: root.secondaryText
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
|
||||
Text {
|
||||
text: root.formatSpeed(root.downloadSpeed)
|
||||
font.pixelSize: 18
|
||||
font.weight: Font.Bold
|
||||
color: root.downloadValueColor
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 中间分隔线
|
||||
Rectangle {
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 12
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 12
|
||||
width: 1
|
||||
color: root.cardBorder
|
||||
}
|
||||
|
||||
// 上传半区（右半）
|
||||
Item {
|
||||
id: uploadHalf
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.rightMargin: 12
|
||||
width: (parent.width - 1) / 2 - 12
|
||||
|
||||
ColumnLayout {
|
||||
anchors.centerIn: parent
|
||||
spacing: 4
|
||||
|
||||
Rectangle {
|
||||
width: 32
|
||||
height: 32
|
||||
radius: 16
|
||||
color: root.accentGreenLight
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
|
||||
Text {
|
||||
anchors.centerIn: parent
|
||||
text: "↑"
|
||||
font.pixelSize: 18
|
||||
font.weight: Font.Bold
|
||||
color: root.accentGreen
|
||||
}
|
||||
}
|
||||
|
||||
Text {
|
||||
text: qsTr("上传")
|
||||
font.pixelSize: 11
|
||||
color: root.secondaryText
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
|
||||
Text {
|
||||
text: root.formatSpeed(root.uploadSpeed)
|
||||
font.pixelSize: 18
|
||||
font.weight: Font.Bold
|
||||
color: root.uploadValueColor
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 总量统计：单行紧凑
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 44
|
||||
color: root.cardBackground
|
||||
radius: 12
|
||||
border.width: 1
|
||||
border.color: root.cardBorder
|
||||
visible: root.ready
|
||||
|
||||
RowLayout {
|
||||
anchors.fill: parent
|
||||
anchors.margins: 12
|
||||
spacing: 8
|
||||
|
||||
Item { Layout.fillWidth: true }
|
||||
|
||||
Text {
|
||||
text: qsTr("总计")
|
||||
font.pixelSize: 11
|
||||
font.weight: Font.Bold
|
||||
color: root.secondaryText
|
||||
}
|
||||
|
||||
Text {
|
||||
text: "↓ " + root.formatTotal(root.totalDownload)
|
||||
font.pixelSize: 12
|
||||
color: root.primaryText
|
||||
}
|
||||
|
||||
Text {
|
||||
text: "↑ " + root.formatTotal(root.totalUpload)
|
||||
font.pixelSize: 12
|
||||
color: root.primaryText
|
||||
}
|
||||
|
||||
Item { Layout.fillWidth: true }
|
||||
}
|
||||
}
|
||||
|
||||
// 接口切换 chip 列表：水平滚动，物理网卡在前、虚拟网卡在后，顺序稳定不随切换变化
|
||||
// chip 少时分散撑满一行；chip 多超出宽度时固定宽度 + 水平滚动
|
||||
// 活动 chip 不在可视区域或被截断时，自动滚动露出完整样式（见 scrollToActiveChip）
|
||||
Flickable {
|
||||
id: chipFlickable
|
||||
Layout.fillWidth: true
|
||||
// 高度需容纳 chip（28px）+ 水平滚动条（~6px）+ 上下间距，
|
||||
// 此前 32px 仅剩 4px 给滚动条，导致滚动条无法正常显示
|
||||
Layout.preferredHeight: 40
|
||||
visible: root.ready && root.networkInterfaces.length > 1
|
||||
contentWidth: Math.max(chipRow.width, width)
|
||||
contentHeight: chipRow.height
|
||||
flickableDirection: Flickable.HorizontalFlick
|
||||
clip: true
|
||||
|
||||
// 平滑滚动动画：直接赋值 contentX 会被 Flickable 的拖拽/回弹行为覆盖，
|
||||
// 用 NumberAnimation 驱动 contentX 实现自动滚动，平滑且不冲突
|
||||
NumberAnimation {
|
||||
id: chipScrollAnim
|
||||
target: chipFlickable
|
||||
property: "contentX"
|
||||
duration: 200
|
||||
easing.type: Easing.OutCubic
|
||||
}
|
||||
|
||||
// 用户开始拖拽/滑动时停止自动滚动，避免动画与用户操作争抢
|
||||
onMovementStarted: chipScrollAnim.stop()
|
||||
|
||||
// 自动滚动使活动接口的 chip 完整可见：
|
||||
// 列表顺序稳定后活动 chip 可能位于可视区域外或被截断，
|
||||
// 切换接口或 popup 打开时调用，将其滚动露出完整样式。
|
||||
// animated=false 用于 popup 刚打开时立即定位，跳过滚动过程
|
||||
function scrollToActiveChip(animated) {
|
||||
if (!visible || width <= 0) return
|
||||
var idx = root.sortedInterfaces.indexOf(root.activeInterface)
|
||||
if (idx < 0) return
|
||||
var chip = chipRepeater.itemAt(idx)
|
||||
if (!chip) return
|
||||
var targetX = contentX
|
||||
if (chip.x < contentX) {
|
||||
// chip 在可视区左侧之外：回滚使 chip 左边缘与可视区左缘对齐
|
||||
targetX = chip.x
|
||||
} else if (chip.x + chip.width > contentX + width) {
|
||||
// chip 在可视区右侧之外或被截断：滚动使 chip 右边缘与可视区右缘对齐
|
||||
targetX = chip.x + chip.width - width
|
||||
}
|
||||
// 钳制到合法滚动范围 [0, contentWidth - width]，避免触发边界回弹
|
||||
targetX = Math.max(0, Math.min(targetX, Math.max(0, contentWidth - width)))
|
||||
if (Math.abs(targetX - contentX) < 1) return
|
||||
chipScrollAnim.stop()
|
||||
if (animated) {
|
||||
chipScrollAnim.to = targetX
|
||||
chipScrollAnim.start()
|
||||
} else {
|
||||
contentX = targetX
|
||||
}
|
||||
}
|
||||
|
||||
// 活动接口变化时（用户点击 chip 或后端自动切换）自动滚动露出活动 chip
|
||||
Connections {
|
||||
target: root
|
||||
function onActiveInterfaceChanged() {
|
||||
chipFlickable.scrollToActiveChip(true)
|
||||
}
|
||||
}
|
||||
|
||||
// 等宽分配宽度：假设所有 chip 等宽撑满时的单个宽度
|
||||
readonly property real equalChipWidth: root.sortedInterfaces.length > 0
|
||||
? (width - 6 * (root.sortedInterfaces.length - 1)) / root.sortedInterfaces.length
|
||||
: 0
|
||||
|
||||
Row {
|
||||
id: chipRow
|
||||
spacing: 6
|
||||
|
||||
Repeater {
|
||||
id: chipRepeater
|
||||
model: root.sortedInterfaces
|
||||
|
||||
Rectangle {
|
||||
// 宽度取等宽和自然宽度的较大值：
|
||||
// chip 少时 equalChipWidth > 自然宽度 -> 分散撑满一行
|
||||
// chip 多时 自然宽度 > equalChipWidth -> 固定宽度 + 水平滚动
|
||||
width: Math.max(chipFlickable.equalChipWidth, chipText.implicitWidth + 24)
|
||||
height: 28
|
||||
radius: 8
|
||||
color: modelData === root.activeInterface
|
||||
? root.accentBlue
|
||||
: (chipMouse.containsMouse ? root.accentBlueLight : root.cardBackground)
|
||||
border.width: 1
|
||||
border.color: modelData === root.activeInterface
|
||||
? root.accentBlue
|
||||
: root.cardBorder
|
||||
|
||||
Text {
|
||||
id: chipText
|
||||
anchors.centerIn: parent
|
||||
text: modelData
|
||||
font.pixelSize: 11
|
||||
font.weight: modelData === root.activeInterface ? Font.Bold : Font.Normal
|
||||
color: modelData === root.activeInterface ? "white" : root.primaryText
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
id: chipMouse
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.PointingHandCursor
|
||||
hoverEnabled: true
|
||||
onClicked: {
|
||||
if (root.applet) root.applet.setActiveInterface(modelData)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 自定义滚动条样式：默认 ScrollBar 在面板配色下可能不可见，
|
||||
// 用 contentItem 显式绘制，颜色派生自 basePalette 适配深浅主题
|
||||
ScrollBar.horizontal: ScrollBar {
|
||||
id: chipScrollBar
|
||||
policy: ScrollBar.AsNeeded
|
||||
interactive: true
|
||||
|
||||
contentItem: Rectangle {
|
||||
implicitHeight: 4
|
||||
radius: 2
|
||||
// 按压时加深、悬停时中等、默认稍淡，保证滚动条在深浅主题下均可见
|
||||
color: chipScrollBar.pressed ? root.secondaryText
|
||||
: (chipScrollBar.hovered ? root.secondaryText : root.tertiaryText)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 未检测到接口占位
|
||||
Rectangle {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 80
|
||||
color: root.cardBackground
|
||||
radius: 12
|
||||
border.width: 1
|
||||
border.color: root.cardBorder
|
||||
visible: !root.ready
|
||||
|
||||
ColumnLayout {
|
||||
anchors.centerIn: parent
|
||||
spacing: 6
|
||||
|
||||
Text {
|
||||
text: "⚠"
|
||||
font.pixelSize: 24
|
||||
color: root.secondaryText
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
|
||||
Text {
|
||||
text: qsTr("未检测到网络接口")
|
||||
font.pixelSize: 12
|
||||
color: root.secondaryText
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Item { Layout.fillHeight: true }
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
|
||||
Reference in New Issue
Block a user