openkylin
/
ukui-menu
mirror of https://gitee.com/openkylin/ukui-menu.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

ui: 调整所有控件颜色跟随主题切换

This commit is contained in:
hewenfei 2024-02-02 15:42:23 +08:00
parent 588b7a4fcd
commit 82f4eceb1e
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qml/AppControls2/RoundButton.qml
View File

@ -14,7 +14,7 @@ MouseArea {
UkuiItems.StyleBackground { UkuiItems.StyleBackground {
id: buttonBase id: buttonBase
useStyleTransparency: false useStyleTransparency: false
paletteRole: mainWindow.isFullScreen ? Platform.Theme.Light : Platform.Theme.Text paletteRole: Platform.Theme.Text
anchors.fill: parent anchors.fill: parent
radius: height / 2 radius: height / 2
alpha: buttonMouseArea.containsPress ? 0.20 : buttonMouseArea.containsMouse ? 0.16 : 0.10 alpha: buttonMouseArea.containsPress ? 0.20 : buttonMouseArea.containsMouse ? 0.16 : 0.10

2
qml/AppUI/AppLabelPage.qml
View File

@ -65,7 +65,7 @@ GridView {
border.width: (parent.GridView.isCurrentItem && !mainWindow.isFullScreen) ? 2 : 0 border.width: (parent.GridView.isCurrentItem && !mainWindow.isFullScreen) ? 2 : 0
borderColor: Platform.Theme.Highlight borderColor: Platform.Theme.Highlight
Text { UkuiItems.StyleText {
anchors.fill: parent anchors.fill: parent
visible: modelData.type === LabelItem.Text visible: modelData.type === LabelItem.Text
text: modelData.display text: modelData.display

4
qml/AppUI/PluginSelectButton.qml
View File

@ -61,7 +61,7 @@ UkuiItems.StyleBackground {
ToolTip.visible: containsMouse ToolTip.visible: containsMouse
background.radius: width / 2 background.radius: width / 2
icon.mode: parent.currentId === 0 ? mainWindow.isFullScreen ? UkuiItems.Icon.AutoHighlight : UkuiItems.Icon.Normal : UkuiItems.Icon.Disabled icon.mode: parent.currentId === 0 ? UkuiItems.Icon.AutoHighlight : UkuiItems.Icon.Disabled
icon.source: pluginSortButtonRoot.model.getProviderIcon(0); icon.source: pluginSortButtonRoot.model.getProviderIcon(0);
background.paletteRole: Platform.Theme.Light background.paletteRole: Platform.Theme.Light
background.alpha: parent.currentId === 0 ? 0.7 : 0 background.alpha: parent.currentId === 0 ? 0.7 : 0
@ -89,7 +89,7 @@ UkuiItems.StyleBackground {
ToolTip.visible: containsMouse ToolTip.visible: containsMouse
background.radius: width / 2 background.radius: width / 2
icon.mode: parent.currentId === 1 ? mainWindow.isFullScreen ? UkuiItems.Icon.AutoHighlight : UkuiItems.Icon.Normal : UkuiItems.Icon.Disabled icon.mode: parent.currentId === 1 ? UkuiItems.Icon.AutoHighlight : UkuiItems.Icon.Disabled
icon.source: pluginSortButtonRoot.model.getProviderIcon(1); icon.source: pluginSortButtonRoot.model.getProviderIcon(1);
background.paletteRole: Platform.Theme.Light background.paletteRole: Platform.Theme.Light
background.alpha: parent.currentId === 1 ? 0.7 : 0 background.alpha: parent.currentId === 1 ? 0.7 : 0

6
qml/AppUI/SearchInputBar.qml
View File

@ -60,7 +60,7 @@ UkuiItems.StyleBackground {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.height / 2; height: width width: parent.height / 2; height: width
source: "search-symbolic" source: "search-symbolic"
mode: mainWindow.isFullScreen ? UkuiItems.Icon.Highlight : UkuiItems.Icon.AutoHighlight mode: UkuiItems.Icon.AutoHighlight
} }
} }
@ -71,7 +71,7 @@ UkuiItems.StyleBackground {
anchors.left: searchIcon.right anchors.left: searchIcon.right
text: qsTr("Search App") text: qsTr("Search App")
visible: textInput.contentWidth === 0 visible: textInput.contentWidth === 0
paletteRole: mainWindow.isFullScreen ? Platform.Theme.HighlightedText : Platform.Theme.Text paletteRole: Platform.Theme.Text
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
alpha: 0.25 alpha: 0.25
} }
@ -145,7 +145,7 @@ UkuiItems.StyleBackground {
background.radius: width/2 background.radius: width/2
background.border.width: 1 background.border.width: 1
icon.source: "edit-clear-symbolic" icon.source: "edit-clear-symbolic"
icon.mode: mainWindow.isFullScreen ? UkuiItems.Icon.Highlight : UkuiItems.Icon.AutoHighlight icon.mode: UkuiItems.Icon.AutoHighlight
onClicked: { onClicked: {
textInput.clear(); textInput.clear();

2
qml/AppUI/Sidebar.qml
View File

@ -64,7 +64,7 @@ Item {
} }
background.radius: Platform.Theme.minRadius background.radius: Platform.Theme.minRadius
icon.mode: mainWindow.isFullScreen ? UkuiItems.Icon.Highlight : UkuiItems.Icon.AutoHighlight icon.mode: UkuiItems.Icon.AutoHighlight
icon.source: mainWindow.isFullScreen ? "view-restore-symbolic" : "view-fullscreen-symbolic" icon.source: mainWindow.isFullScreen ? "view-restore-symbolic" : "view-fullscreen-symbolic"
} }

3
qml/main.qml
View File

@ -21,6 +21,7 @@ import AppUI 1.0 as AppUI
import AppControls2 1.0 as AppControls2 import AppControls2 1.0 as AppControls2
import org.ukui.menu.core 1.0 import org.ukui.menu.core 1.0
import org.ukui.quick.items 1.0 as UkuiItems import org.ukui.quick.items 1.0 as UkuiItems
import org.ukui.quick.platform 1.0 as Platform
Item { Item {
id: root id: root
@ -109,7 +110,7 @@ Item {
x: 0; y: 0 x: 0; y: 0
height: normalScreenGeometry.normalGeometry.height height: normalScreenGeometry.normalGeometry.height
width: normalScreenGeometry.normalGeometry.width width: normalScreenGeometry.normalGeometry.width
radius: 12 radius: Platform.Theme.windowRadius
onHeightChanged: { onHeightChanged: {
if (root.transparency <= 0.6 && root.onComlpeted) { if (root.transparency <= 0.6 && root.onComlpeted) {