From 88ed7cd35abb0978d3a3ae0ffd6ff2a49ef35914 Mon Sep 17 00:00:00 2001
From: jonymt <johanmt@yandex.ru>
Date: Wed, 25 Sep 2019 13:59:36 +0200
Subject: [PATCH] [*] fixed design
---
.../DapUiQmlScreenConsoleForm.ui.qml | 1 +
.../DapUiQmlWidgetLastActions.qml | 16 ++++++++++++-
.../DapUiQmlWidgetLastActionsHeaderForm.qml | 23 ++++++-------------
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
index 56fc11f42..2d1b09696 100644
--- a/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
+++ b/CellFrameDashboardGUI/DapUiQmlScreenConsoleForm.ui.qml
@@ -22,6 +22,7 @@ Page {
DapUiQmlWidgetConsoleLastActionsForm {
id: lastActionsPanel
consoleData: dapConsoleForm.textAreaCmdHistory
+// border.color: "transparent"
}
}
}
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
index 43b5284e3..4ff619a69 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetLastActions.qml
@@ -29,11 +29,25 @@ DapUiQmlWidgetLastActionsForm {
DapUiQmlWidgetLastActionsHeaderForm {
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 {
id: dapListView
- anchors.top: dapHeader.bottom
+ anchors.top: splitHeader.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
index 5a999d93f..bc8002bda 100644
--- a/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
+++ b/CellFrameDashboardGUI/DapUiQmlWidgetLastActionsHeaderForm.qml
@@ -4,24 +4,15 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12
Rectangle {
- width: parent.width
- height: 36 * pt
color: "#EDEFF2"
- Item {
- width: childrenRect.width
- height: childrenRect.height
- anchors.top: parent.top
- anchors.left: parent.left
-
+ Text {
+ anchors.fill: parent
anchors.leftMargin: 16 * pt
- anchors.topMargin: 13
-
- Text {
- text: qsTr("Last actions")
- font.family: "Roboto"
- font.pixelSize: 12 * pt
- color: "#5F5F63"
- }
+ text: qsTr("Last actions")
+ verticalAlignment: Qt.AlignVCenter
+ font.family: "Roboto"
+ font.pixelSize: 12 * pt
+ color: "#5F5F63"
}
}
--
GitLab