Skip to content
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

enhancement(Orders): Fix order close button display & change progress system #978

Merged
merged 2 commits into from
Jun 18, 2021
Merged

enhancement(Orders): Fix order close button display & change progress system #978

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62f2129
enhancement(Orders): Fix order close button display & change progress…
ssakone Jun 12, 2021
ca95b00
enhancement(orders_rework): remove progress bar
ssakone Jun 17, 2021
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
23 changes: 11 additions & 12 deletions atomic_defi_design/qml/Exchange/Trade/Orders/OrderLine.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Rectangle {
RowLayout {
id: status_text
Layout.fillHeight: true
Layout.preferredWidth: 25
Layout.preferredWidth: 15

spacing: 5
visible: clickable? !details ? false :
Expand All @@ -47,14 +47,6 @@ Rectangle {
text_value: !details ? "" :
visible ? getStatusStep(details.order_status) : ''
}

DefaultBusyIndicator {
Layout.alignment: Qt.AlignVCenter
//visible: true //!isSwapDone(details.order_status)
running: !isSwapDone(details.order_status) && Qt.platform.os != "osx"
Layout.preferredWidth: 20
Layout.preferredHeight: Layout.preferredWidth
}
}
Item {
Layout.fillHeight: true
Expand Down Expand Up @@ -164,17 +156,22 @@ Rectangle {
id: cancel_button_text
visible: (!is_history? details.cancellable?? false : false)===true? (mouse_area.containsMouse || hovered)? true : false : false

icon.source: Qaterial.Icons.close
Layout.fillHeight: true
Layout.preferredWidth: 30
foregroundColor: Qaterial.Colors.pink300
Layout.alignment: Qt.AlignVCenter
outlinedColor: Style.colorTheme5
Behavior on scale {
NumberAnimation { duration: 200 }
}
Qaterial.ColorIcon {
iconSize: 13
color: Qaterial.Colors.pink300
source: Qaterial.Icons.close
anchors.centerIn: parent
scale: parent.visible? 1 : 0
}

scale: visible? 1 : 0

onClicked: { if(details) cancelOrder(details.order_id) }
hoverEnabled: true

Expand Down Expand Up @@ -205,4 +202,6 @@ Rectangle {
opacity: .4
anchors.bottom: parent.bottom
}

// !isSwapDone(details.order_status) && Qt.platform.os != "osx" needeed for new progress later
}