Skip to content

Fix disappearing bg and wrong padding on widnows for reset button #4602

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

Open
xkello wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix disappearing bg and wrong padding on widnows for reset button #4602

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
10 changes: 5 additions & 5 deletions app/qml/components/MMButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ Button {

implicitWidth: {
let margin = __style.margin20
if ( root.type === MMButton.Types.Tertiary ) margin = 0
else if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8
if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8
else if ( root.type === MMButton.Types.Tertiary ) margin = 0
else if ( root.size === MMButton.Sizes.Small ) margin = __style.margin16
return row.paintedChildrenWidth + 2 * margin
}
Expand Down Expand Up @@ -214,9 +214,9 @@ Button {

property real paintedChildrenWidth: buttonIconLeft.paintedWidth + buttonContent.implicitWidth + buttonIconRight.paintedWidth + spacing
property real maxWidth: {
let margin = __style.margin20
if ( root.type === MMButton.Types.Tertiary ) margin = 0
else if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8
let margin = __style.margin20
if ( root.size === MMButton.Sizes.ExtraSmall ) margin = __style.margin8
else if ( root.type === MMButton.Types.Tertiary ) margin = 0
else if ( root.size === MMButton.Sizes.Small ) margin = __style.margin16
return parent.width - 2 * margin
}
Expand Down
2 changes: 2 additions & 0 deletions app/qml/filters/components/MMFilterBanner.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ Rectangle {
text: root.actionText
fontColor: __style.skyColor
bgndColor: __style.deepOceanColor
bgndColorHover: __style.deepOceanColor
fontColorHover: __style.skyColor

onClicked: root.actionClicked()
}
Expand Down
Loading