3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 08:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix misalignment of images if the displayName spans to next line

Browse source 
When the displayname of the app is long and it spans to the next line, it was pushing the icon up in the column, making it seem like it is misaligned. This is now fixed and the icons should be aligned regardless if the display name has one or two lines.

CURA-8421
This commit is contained in:
Konstantinos Karmas 2021-09-20 16:42:22 +02:00
parent 15884a66e8
commit a9968acd6d
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/ApplicationSwitcher/ApplicationButton.qml
View file

@ -36,7 +36,6 @@ Button
{ {
id: applicationButtonContent id: applicationButtonContent
anchors.centerIn: parent anchors.centerIn: parent
spacing: UM.Theme.getSize("default_margin").width
UM.RecolorImage UM.RecolorImage
{ {
@ -91,8 +90,9 @@ Button
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: base.width - UM.Theme.getSize("default_margin").width width: base.width - UM.Theme.getSize("default_margin").width
height: base.height - applicationIcon.height - 2 * UM.Theme.getSize("default_margin").width // Account for the top and bottom margins
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
maximumLineCount: 2 verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap wrapMode: Text.Wrap
elide: Text.ElideRight elide: Text.ElideRight
} }

2
resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
View file

@ -26,7 +26,7 @@ Item
background: UM.RecolorImage background: UM.RecolorImage
{ {
width: UM.Theme.getSize("small_button_icon").width width: parent.width
height: width height: width
anchors.verticalCenter: appSwitcherButton.verticalCenter anchors.verticalCenter: appSwitcherButton.verticalCenter
anchors.horizontalCenter: appSwitcherButton.horizontalCenter anchors.horizontalCenter: appSwitcherButton.horizontalCenter

4
resources/themes/cura-light/icons/default/ApplicationSwitcher.svg
View file

@ -1,3 +1,3 @@
<svg viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"> <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M4 4H0V3C0 2.20435 0.316071 1.44129 0.87868 0.87868C1.44129 0.316071 2.20435 0 3 0H4V4ZM11 0H7V4H11V0ZM18 3C18 2.20435 17.6839 1.44129 17.1213 0.87868C16.5587 0.316071 15.7956 0 15 0H14V4H18V3ZM4 7H0V11H4V7ZM11 7H7V11H11V7ZM18 7H14V11H18V7ZM4 14H0V15C0 15.7956 0.316071 16.5587 0.87868 17.1213C1.44129 17.6839 2.20435 18 3 18H4V14ZM11 14H7V18H11V14ZM18 15V14H14V18H15C15.7956 18 16.5587 17.6839 17.1213 17.1213C17.6839 16.5587 18 15.7956 18 15Z" fill="#000E1A"/> <path d="M7 7H3V6C3 5.20435 3.31607 4.44129 3.87868 3.87868C4.44129 3.31607 5.20435 3 6 3H7V7ZM14 3H10V7H14V3ZM21 6C21 5.20435 20.6839 4.44129 20.1213 3.87868C19.5587 3.31607 18.7956 3 18 3H17V7H21V6ZM7 10H3V14H7V10ZM14 10H10V14H14V10ZM21 10H17V14H21V10ZM7 17H3V18C3 18.7956 3.31607 19.5587 3.87868 20.1213C4.44129 20.6839 5.20435 21 6 21H7V17ZM14 17H10V21H14V17ZM21 18V17H17V21H18C18.7956 21 19.5587 20.6839 20.1213 20.1213C20.6839 19.5587 21 18.7956 21 18Z" fill="#000E1A"/>
</svg> </svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 540 B

After

Width:  |  Height:  |  Size: 580 B

Before After
Before After