Skip to content
Snippets Groups Projects
Commit 5eb7441d authored by jonymt's avatar jonymt
Browse files

Merge branch 'master' into features-2510

parents 500e2719 e3b4ccdc
No related branches found
No related tags found
1 merge request!16Features 2510
...@@ -22,6 +22,7 @@ Page { ...@@ -22,6 +22,7 @@ Page {
DapUiQmlWidgetConsoleLastActionsForm { DapUiQmlWidgetConsoleLastActionsForm {
id: lastActionsPanel id: lastActionsPanel
consoleData: dapConsoleForm.textAreaCmdHistory consoleData: dapConsoleForm.textAreaCmdHistory
// border.color: "transparent"
} }
} }
} }
...@@ -29,11 +29,25 @@ DapUiQmlWidgetLastActionsForm { ...@@ -29,11 +29,25 @@ DapUiQmlWidgetLastActionsForm {
DapUiQmlWidgetLastActionsHeaderForm { DapUiQmlWidgetLastActionsHeaderForm {
id: dapHeader id: dapHeader
height: 36 * pt
anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
anchors.leftMargin: 1 * pt
}
Rectangle {
id: splitHeader
anchors.top: dapHeader.bottom
anchors.left: parent.left
anchors.right: parent.right
height: 1 * pt
color: "#C2CAD1"
} }
ListView { ListView {
id: dapListView id: dapListView
anchors.top: dapHeader.bottom anchors.top: splitHeader.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
......
...@@ -4,24 +4,15 @@ import QtQuick.Controls 2.2 ...@@ -4,24 +4,15 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.12
Rectangle { Rectangle {
width: parent.width
height: 36 * pt
color: "#EDEFF2" color: "#EDEFF2"
Item { Text {
width: childrenRect.width anchors.fill: parent
height: childrenRect.height
anchors.top: parent.top
anchors.left: parent.left
anchors.leftMargin: 16 * pt anchors.leftMargin: 16 * pt
anchors.topMargin: 13 text: qsTr("Last actions")
verticalAlignment: Qt.AlignVCenter
Text { font.family: "Roboto"
text: qsTr("Last actions") font.pixelSize: 12 * pt
font.family: "Roboto" color: "#5F5F63"
font.pixelSize: 12 * pt
color: "#5F5F63"
}
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment