GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 00:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some layout issues

Browse Source 
CURA-7418
This commit is contained in:
Jaime van Kessel 2020-06-15 14:09:01 +02:00
parent a7e7ddf4b5
commit 0edb93176a
No known key found for this signature in database
GPG Key ID: 3710727397403C91
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/Account/AccountWidget.qml
View File

@ -131,7 +131,7 @@ Item
opacity: opened ? 1 : 0 opacity: opened ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } } Behavior on opacity { NumberAnimation { duration: 100 } }
padding: UM.Theme.getSize("wide_margin").height padding: 0
contentItem: AccountDetails contentItem: AccountDetails
{} {}

2
resources/qml/Account/GeneralOperations.qml
View File

@ -10,7 +10,7 @@ import Cura 1.1 as Cura
Column Column
{ {
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
padding: UM.Theme.getSize("default_margin").width
Image Image
{ {
id: machinesImage id: machinesImage

4
resources/qml/Account/SyncState.qml
View File

@ -11,7 +11,6 @@ Row // Sync state icon + message
id: syncRow id: syncRow
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
anchors.horizontalCenter: parent.horizontalCenter
spacing: UM.Theme.getSize("narrow_margin").height spacing: UM.Theme.getSize("narrow_margin").height
states: [ states: [
@ -49,7 +48,6 @@ Row // Sync state icon + message
id: palette id: palette
} }
UM.RecolorImage UM.RecolorImage
{ {
id: icon id: icon
@ -91,6 +89,7 @@ Row // Sync state icon + message
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering renderType: Text.NativeRendering
width: contentWidth + UM.Theme.getSize("default_margin").height
height: contentHeight height: contentHeight
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
visible: !Cura.API.account.manualSyncEnabled visible: !Cura.API.account.manualSyncEnabled
@ -105,6 +104,7 @@ Row // Sync state icon + message
renderType: Text.NativeRendering renderType: Text.NativeRendering
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
height: contentHeight height: contentHeight
width: contentWidth + UM.Theme.getSize("default_margin").height
visible: Cura.API.account.manualSyncEnabled visible: Cura.API.account.manualSyncEnabled
MouseArea MouseArea

8
resources/qml/Account/UserOperations.qml
View File

@ -10,11 +10,17 @@ import Cura 1.1 as Cura
Column Column
{ {
spacing: UM.Theme.getSize("narrow_margin").height spacing: UM.Theme.getSize("narrow_margin").height
topPadding: UM.Theme.getSize("default_margin").height
bottomPadding: UM.Theme.getSize("default_margin").height
width: childrenRect.width
Item Item
{ {
id: accountInfo
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
AvatarImage AvatarImage
{ {
id: avatar id: avatar
@ -30,6 +36,8 @@ Column
anchors.left: avatar.right anchors.left: avatar.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
spacing: UM.Theme.getSize("narrow_margin").height spacing: UM.Theme.getSize("narrow_margin").height
width: childrenRect.width
height: childrenRect.height
Label Label
{ {
id: username id: username