Skip to content

fix(dcc): 48px description rows and min height #3411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mhduiy wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Draft

fix(dcc): 48px description rows and min height #3411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/dde-control-center/plugin/DccEditorItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ D.ItemDelegate {
property real rightItemBottomMargin: 5

implicitHeight: Math.max(model.item.description.length !== 0 ? 48 : 40, implicitContentHeight) + topInset + bottomInset
Layout.minimumHeight: (model.item.description.length !== 0 ? 48 : 40) + topInset + bottomInset
backgroundVisible: false
checkable: false
topPadding: topInset
Expand Down
8 changes: 4 additions & 4 deletions src/dde-control-center/plugin/DccGroupView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ Rectangle {
DelegateChoice {
roleValue: DccObject.Editor
delegate: DccEditorItem {
topInset: control.isGroup ? 0 : 3
bottomInset: control.isGroup ? 0 : 3
topInset: (control.isGroup || model.item.description.length !== 0) ? 0 : 3
bottomInset: (control.isGroup || model.item.description.length !== 0) ? 0 : 3
separatorVisible: control.isGroup
backgroundType:model.item.backgroundType | (control.isGroup ? 1 : 0)
Layout.fillWidth: true
Expand All @@ -114,8 +114,8 @@ Rectangle {
DelegateChoice {
roleValue: DccObject.MenuEditor
delegate: DccMenuEditorItem {
topInset: control.isGroup ? 0 : 3
bottomInset: control.isGroup ? 0 : 3
topInset: (control.isGroup || model.item.description.length !== 0) ? 0 : 3
bottomInset: (control.isGroup || model.item.description.length !== 0) ? 0 : 3
separatorVisible: control.isGroup
backgroundType: model.item.backgroundType | DccObject.ClickStyle
Layout.fillWidth: true
Expand Down
Loading