mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-01-10 03:42:05 +02:00
Dropdown button development - removing the second column
This commit is contained in:
parent
6d21b9919d
commit
c3e1b51ac4
@ -41,7 +41,7 @@ Item {
|
|||||||
|
|
||||||
signal changed();
|
signal changed();
|
||||||
|
|
||||||
height: 37 * scaleRatio
|
height: 48 * scaleRatio
|
||||||
|
|
||||||
onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
|
onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
|
||||||
function hide() { dropdown.expanded = false }
|
function hide() { dropdown.expanded = false }
|
||||||
@ -60,7 +60,6 @@ Item {
|
|||||||
// Workaroud for suspected memory leak in 5.8 causing malloc crash on app exit
|
// Workaroud for suspected memory leak in 5.8 causing malloc crash on app exit
|
||||||
function update() {
|
function update() {
|
||||||
firstColText.text = column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column1) + translationManager.emptyString : ""
|
firstColText.text = column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column1) + translationManager.emptyString : ""
|
||||||
secondColText.text = column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column2) + translationManager.emptyString : ""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
@ -68,42 +67,15 @@ Item {
|
|||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
height: 37 * scaleRatio
|
height: 48 * scaleRatio
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
anchors.left: parent.left
|
color: "transparent"
|
||||||
anchors.right: parent.right
|
border.width: 1
|
||||||
height: parent.height - 1
|
border.color: Qt.rgba(1, 1, 1, 0.25)
|
||||||
y: dropdown.expanded || droplist.height > 0 ? 0 : 1
|
radius: 4
|
||||||
color: dropdown.expanded || droplist.height > 0 ? dropdown.shadowPressedColor : dropdown.shadowReleasedColor
|
anchors.fill: parent
|
||||||
//radius: 4
|
z: 4
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.right: parent.right
|
|
||||||
height: parent.height - 1
|
|
||||||
y: dropdown.expanded || droplist.height > 0 ? 1 : 0
|
|
||||||
color: dropdown.expanded || droplist.height > 0 ? dropdown.pressedColor : dropdown.releasedColor
|
|
||||||
//radius: 4
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
anchors.left: parent.left
|
|
||||||
anchors.bottom: parent.bottom
|
|
||||||
height: 3 * scaleRatio
|
|
||||||
width: 3 * scaleRatio
|
|
||||||
color: dropdown.pressedColor
|
|
||||||
visible: dropdown.expanded || droplist.height > 0
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
anchors.right: parent.right
|
|
||||||
anchors.bottom: parent.bottom
|
|
||||||
height: 3 * scaleRatio
|
|
||||||
width: 3 * scaleRatio
|
|
||||||
color: dropdown.pressedColor
|
|
||||||
visible: dropdown.expanded || droplist.height > 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
@ -112,31 +84,9 @@ Item {
|
|||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: 12 * scaleRatio
|
anchors.leftMargin: 12 * scaleRatio
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
font.family: "Arial"
|
font.family: Style.fontRegular.name
|
||||||
font.bold: true
|
font.bold: true
|
||||||
font.pixelSize: 12 * scaleRatio
|
font.pixelSize: 16 * scaleRatio
|
||||||
color: "#FFFFFF"
|
|
||||||
}
|
|
||||||
|
|
||||||
Text {
|
|
||||||
id: secondColText
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
anchors.right: separator.left
|
|
||||||
anchors.rightMargin: 12 * scaleRatio
|
|
||||||
width: dropdown.expanded ? w : (separator.x - 12) - (firstColText.x + firstColText.width + 5)
|
|
||||||
font.family: "Arial"
|
|
||||||
font.pixelSize: 12 * scaleRatio
|
|
||||||
color: "#FFFFFF"
|
|
||||||
property int w: 0
|
|
||||||
Component.onCompleted: w = implicitWidth
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
id: separator
|
|
||||||
anchors.right: dropIndicator.left
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
height: 18 * scaleRatio
|
|
||||||
width: 1
|
|
||||||
color: "#FFFFFF"
|
color: "#FFFFFF"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user