Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions qml/AppItemMenu.qml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Loader {
rightMargin: isFullscreen && DesktopIntegration.dockPosition === Qt.RightArrow ? dockSpacing : 0
modal: true

font: DTK.fontManager.t6
// 在全屏模式下,右键菜单适配系统深浅模式
// 通过设置palette来实现主题适配
palette: DTK.palette
Expand Down
2 changes: 2 additions & 0 deletions qml/DummyAppItemMenu.qml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Loader {
rightMargin: isFullscreen && DesktopIntegration.dockPosition === Qt.RightArrow ? dockSpacing : 0
modal: true

font: DTK.fontManager.t6

MenuItem {
text: qsTr("Install")
onTriggered: {
Expand Down
3 changes: 3 additions & 0 deletions qml/windowed/AppListView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@ FocusScope {
modal: true
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutsideParent

font: DTK.fontManager.t6

property var existingSections: []
Repeater {
model: ddeCategoryMenu.existingSections
Expand All @@ -277,6 +279,7 @@ FocusScope {
alignment: Qt.AlignCenter
text: menuItem.text
color: parent.palette.windowText
font: ddeCategoryMenu.font
}
background: BoxPanel {
anchors.left: parent.left
Expand Down
2 changes: 2 additions & 0 deletions qml/windowed/BottomBar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ Control {
id: searchEdit
padding: 1
placeholder: qsTr("Search")
font: DTK.fontManager.t6

property Palette textColor: DStyle.Style.button.text
placeholderTextColor: ColorSelector.textColor
palette.windowText: ColorSelector.textColor
Expand Down
1 change: 1 addition & 0 deletions qml/windowed/SideBar.qml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ColumnLayout {
id: categorizedCom
D.Menu {
id: categorizedMenu
font: D.DTK.fontManager.t6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

感觉是启动器这个场景出了问题,像启动器的搜索框弹出的右键菜单也是错误的,但在控制中心就是对的,
启动器的窗口是个PopupWindow,像是没有继承Window的font变化,


D.MenuItem {
text: qsTr("Free sorting")
Expand Down