mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-28 10:32:22 -04:00
Merge branch 'qml_app_style_buttons' into qml_app_ui_improvements
This commit is contained in:
commit
1ee655978c
6 changed files with 20 additions and 15 deletions
|
@ -4,7 +4,7 @@ import QtQuick.Controls 2.0
|
|||
Item
|
||||
{
|
||||
id: button
|
||||
property alias buttonText: innerText.text;
|
||||
property alias text: innerText.text;
|
||||
property alias buttonTextPixelSize: innerText.font.pixelSize
|
||||
property alias innerAnchors: innerElements.anchors;
|
||||
property alias rectangleButton: rectangleButton;
|
||||
|
@ -12,14 +12,17 @@ Item
|
|||
property var iconUrl
|
||||
property int iconHeight: 20
|
||||
|
||||
property color color
|
||||
property color hoverColor
|
||||
property color pressColor
|
||||
property color color: "lightsteelblue"
|
||||
property color hoverColor: color
|
||||
property color pressColor: color
|
||||
property int fontSize
|
||||
property int borderWidth
|
||||
property int borderRadius
|
||||
property int borderRadius: 3
|
||||
property int innerMargin: 10
|
||||
|
||||
height: innerText.height + innerMargin + innerMargin
|
||||
width: innerText.width + innerMargin + innerMargin + icon.width + icon.width
|
||||
|
||||
scale: state === "Pressed" ? 0.96 : 1.0
|
||||
onEnabledChanged: state = ""
|
||||
signal clicked
|
||||
|
@ -29,7 +32,7 @@ Item
|
|||
id: rectangleButton
|
||||
anchors.fill: parent
|
||||
radius: borderRadius
|
||||
color: button.enabled ? button.color : "grey"
|
||||
color: button.enabled ? button.color : "lavender"
|
||||
border.width: borderWidth
|
||||
border.color: "black"
|
||||
|
||||
|
@ -59,6 +62,7 @@ Item
|
|||
font.pointSize: fontSize
|
||||
anchors.left: icon.right
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: button.enabled ? "black" : "grey"
|
||||
}
|
||||
}
|
||||
}
|
|
@ -111,9 +111,9 @@ Drawer
|
|||
}
|
||||
}
|
||||
|
||||
Btn
|
||||
ButtonText
|
||||
{
|
||||
buttonText: model.title
|
||||
text: model.title
|
||||
width: parent.width
|
||||
height: parent.height
|
||||
color: menuItem.styles.defaultColor
|
||||
|
@ -123,6 +123,7 @@ Drawer
|
|||
iconUrl: (model.icon)? model.icon : undefined
|
||||
innerMargin: 20
|
||||
buttonTextPixelSize: menuItem.styles.pixelSize
|
||||
borderRadius: 0
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue