Skip to content
Snippets Groups Projects
Commit 9480134e authored by Evgenii Tagiltsev's avatar Evgenii Tagiltsev
Browse files

[*] changed for page

parent e0e12a68
No related branches found
No related tags found
1 merge request!41Bugs 2692
Pipeline #1287 passed with stage
in 21 minutes and 40 seconds
...@@ -60,11 +60,14 @@ DapUiQmlScreenMainWindowForm { ...@@ -60,11 +60,14 @@ DapUiQmlScreenMainWindowForm {
listViewTabs.currentIndex = index; listViewTabs.currentIndex = index;
rightPanel.header.clear(StackView.Immediate); rightPanel.header.clear(StackView.Immediate);
rightPanel.content.clear(StackView.Immediate); rightPanel.content.clear(StackView.Immediate);
if(panelHeader !== "" && panelContent !== "")
var headerData = panelHeader;
var contentData = panelContent;
if(panelHeader !== "" || panelContent !== "")
{ {
rightPanel.visible = true; rightPanel.visible = true;
rightPanel.header.push(Qt.resolvedUrl(panelHeader)); if(headerData !== "") rightPanel.header.push(Qt.resolvedUrl(headerData));
rightPanel.content.push(Qt.resolvedUrl(panelContent)); if(contentData !== "") rightPanel.content.push(Qt.resolvedUrl(contentData));
} }
else rightPanel.visible = false; else rightPanel.visible = false;
......
...@@ -4,7 +4,7 @@ import QtQuick.Controls 2.2 ...@@ -4,7 +4,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.12 import QtQuick.Layouts 1.12
Rectangle { Rectangle {
anchors.fill: parent height: 36 * pt
color: "transparent" color: "transparent"
Text { Text {
......
import QtQuick 2.4 import QtQuick 2.4
DapUiQmlWidgetRightPanelForm { DapUiQmlWidgetRightPanelForm {
// Connections {
// target: header
// onCurrentItemChanged: {
// height = currentItem.height
// }
// }
} }
...@@ -4,50 +4,35 @@ import QtQuick.Controls 2.13 ...@@ -4,50 +4,35 @@ import QtQuick.Controls 2.13
Rectangle { Rectangle {
property alias header : stackViewHeader property alias header : stackViewHeader
property alias content : stackViewContent property alias content : stackViewContent
property int headerHeight: 36 * pt property alias background : rightPanelPage.background
property alias footer: stackViewHeader
width: visible ? 400 * pt : 0 width: visible ? 400 * pt : 0
color: "#E3E2E6" color: "#E3E2E6"
Rectangle { Page {
id: rightPanelPage
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 1 anchors.leftMargin: 1
color: "#F8F7FA" background: Rectangle {
color: "#F8F7FA"
Column { }
anchors.fill: parent
Item {
id: headerItem
width: parent.width
height: headerHeight;
StackView {
id: stackViewHeader
anchors.fill: parent
}
// Loader {
// anchors.fill: parent
// sourceComponent: header
// }
}
Item { header: StackView {
width: parent.width id: stackViewHeader
height: parent.height - headerHeight width: parent.width
height: currentItem === null ? 0 : currentItem.height
}
StackView { StackView {
id: stackViewContent id: stackViewContent
anchors.fill: parent anchors.fill: parent
} }
// Loader { footer: StackView {
// anchors.fill: parent id: stackViewFooter
// sourceComponent: content width: parent.width
// } height: currentItem === null ? 0 : currentItem.height
}
} }
} }
} }
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