forked from openkylin/ukui-menu
完善右侧文字跟随高亮,调整布局;添加全屏模式下的菜单选择按钮反色
This commit is contained in:
parent
c8e515fd74
commit
50e26f8676
|
@ -5,7 +5,7 @@
|
||||||
<name>UkuiMenu::RecentFileExtension</name>
|
<name>UkuiMenu::RecentFileExtension</name>
|
||||||
<message>
|
<message>
|
||||||
<source>Recent Files</source>
|
<source>Recent Files</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation>最近</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>Open</source>
|
<source>Open</source>
|
||||||
|
|
|
@ -74,7 +74,6 @@ RowLayout {
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: contentHeight > parent.height ? parent.height : contentHeight
|
height: contentHeight > parent.height ? parent.height : contentHeight
|
||||||
interactive: contentHeight > parent.height
|
interactive: contentHeight > parent.height
|
||||||
spacing: 5
|
|
||||||
|
|
||||||
highlightMoveDuration: animationDuration
|
highlightMoveDuration: animationDuration
|
||||||
highlight: AppControls2.StyleBackground {
|
highlight: AppControls2.StyleBackground {
|
||||||
|
|
|
@ -35,6 +35,8 @@ RowLayout {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.maximumWidth: height
|
Layout.maximumWidth: height
|
||||||
|
|
||||||
|
highlight: mainWindow.isFullScreen
|
||||||
|
autoHighLight: !mainWindow.isFullScreen
|
||||||
buttonIcon: "image://appicon/ukui-selected"
|
buttonIcon: "image://appicon/ukui-selected"
|
||||||
onClicked: pluginSelectMenuRoot.model.autoSwitchProvider();
|
onClicked: pluginSelectMenuRoot.model.autoSwitchProvider();
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,12 +35,15 @@ Item {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 40
|
Layout.preferredHeight: 40
|
||||||
Layout.rightMargin: 12
|
Layout.rightMargin: 12
|
||||||
|
Layout.leftMargin: 16
|
||||||
|
|
||||||
ListView {
|
ListView {
|
||||||
id: extensionListView
|
id: extensionListView
|
||||||
width: parent.width - 34
|
width: parent.width - 34
|
||||||
height: parent.height
|
height: parent.height
|
||||||
clip: true
|
clip: true
|
||||||
|
spacing: 24
|
||||||
|
interactive: false
|
||||||
orientation: ListView.Horizontal
|
orientation: ListView.Horizontal
|
||||||
model: extensionManager.extensionModel()
|
model: extensionManager.extensionModel()
|
||||||
delegate: headerDelegate
|
delegate: headerDelegate
|
||||||
|
@ -147,7 +150,7 @@ Item {
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
property var extensionData: model.data
|
property var extensionData: model.data
|
||||||
width: 100
|
width: styleText.width
|
||||||
height: ListView.view ? ListView.view.height : 0
|
height: ListView.view ? ListView.view.height : 0
|
||||||
|
|
||||||
onExtensionDataChanged: {
|
onExtensionDataChanged: {
|
||||||
|
@ -162,14 +165,15 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
AppControls2.StyleText {
|
||||||
anchors.fill: parent
|
height: parent.height
|
||||||
|
id: styleText
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
font.bold: true
|
font.bold: parent.ListView.isCurrentItem
|
||||||
wrapMode: Text.ElideRight
|
wrapMode: Text.ElideRight
|
||||||
|
|
||||||
color: parent.ListView.isCurrentItem ? "blue" : "black"
|
paletteRole: parent.ListView.isCurrentItem ? Palette.Highlight: Palette.Text
|
||||||
text: model.name
|
text: model.name
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -189,7 +189,7 @@
|
||||||
<name>UkuiMenu::FavoriteExtension</name>
|
<name>UkuiMenu::FavoriteExtension</name>
|
||||||
<message>
|
<message>
|
||||||
<source>Favorite</source>
|
<source>Favorite</source>
|
||||||
<translation>收藏夹</translation>
|
<translation>收藏</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
|
|
Loading…
Reference in New Issue