diff --git a/modules/BluetoothMenu.qml b/modules/BluetoothMenu.qml index 6d4d1e4..f4d58f2 100644 --- a/modules/BluetoothMenu.qml +++ b/modules/BluetoothMenu.qml @@ -76,7 +76,7 @@ M.PopupPanel { anchors.leftMargin: 12 anchors.verticalCenter: parent.verticalCenter text: "\uF294" - color: entry.modelData.connected ? menuWindow.accentColor : M.Theme.base04 + color: entry.modelData.connected ? M.Theme.base0D : M.Theme.base04 font.pixelSize: M.Theme.fontSize + 1 font.family: M.Theme.iconFontFamily } @@ -88,7 +88,7 @@ M.PopupPanel { anchors.rightMargin: 4 anchors.verticalCenter: parent.verticalCenter text: entry.modelData.name - color: entry.modelData.connected ? menuWindow.accentColor : M.Theme.base05 + color: entry.modelData.connected ? M.Theme.base0D : M.Theme.base05 font.pixelSize: M.Theme.fontSize font.family: M.Theme.fontFamily font.bold: entry.modelData.connected diff --git a/modules/HoverPanel.qml b/modules/HoverPanel.qml index e368042..5935c40 100644 --- a/modules/HoverPanel.qml +++ b/modules/HoverPanel.qml @@ -50,26 +50,15 @@ PanelWindow { margins.left = Math.max(0, Math.min(Math.round(pt.x - (scr?.x ?? 0) - contentWidth / 2), sw - contentWidth)); } - Timer { - id: _hideTimer - interval: 50 - onTriggered: { - if (!root.showPanel) { - showAnim.stop(); - hideAnim.start(); - } - } - } - onShowPanelChanged: { if (showPanel) { - _hideTimer.stop(); _updatePosition(); _winVisible = true; hideAnim.stop(); showAnim.start(); } else { - _hideTimer.restart(); + showAnim.stop(); + hideAnim.start(); } } diff --git a/modules/NetworkMenu.qml b/modules/NetworkMenu.qml index bc6a6d2..7b3ca65 100644 --- a/modules/NetworkMenu.qml +++ b/modules/NetworkMenu.qml @@ -110,7 +110,7 @@ M.PopupPanel { anchors.leftMargin: 12 anchors.verticalCenter: parent.verticalCenter text: entry.modelData.isWifi ? "\uF1EB" : "\uDB80\uDE00" - color: entry.modelData.active ? menuWindow.accentColor : M.Theme.base05 + color: entry.modelData.active ? M.Theme.base0D : M.Theme.base05 font.pixelSize: M.Theme.fontSize + 1 font.family: M.Theme.iconFontFamily } @@ -122,7 +122,7 @@ M.PopupPanel { anchors.rightMargin: 4 anchors.verticalCenter: parent.verticalCenter text: entry.modelData.name - color: entry.modelData.active ? menuWindow.accentColor : M.Theme.base05 + color: entry.modelData.active ? M.Theme.base0D : M.Theme.base05 font.pixelSize: M.Theme.fontSize font.family: M.Theme.fontFamily font.bold: entry.modelData.active