From 61d53c51899dc48bc864568090d253e9f988ecef Mon Sep 17 00:00:00 2001
From: Andrey Daragan <tl1989@gmail.com>
Date: Thu, 26 Dec 2019 17:01:52 +0300
Subject: [PATCH] [+] Functional restored.

---
 DapMainWindowForm.ui.qml |  6 ++---
 DapRightPanelForm.ui.qml | 12 +++++-----
 DapScreenForm.ui.qml     |  5 +++--
 DapTabForm.ui.qml        | 48 ++++++++++++++++++++--------------------
 DapTopPanelForm.ui.qml   |  4 ++--
 5 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/DapMainWindowForm.ui.qml b/DapMainWindowForm.ui.qml
index 9837762..6453a23 100644
--- a/DapMainWindowForm.ui.qml
+++ b/DapMainWindowForm.ui.qml
@@ -11,9 +11,6 @@ Rectangle
 
     ///@detalis Logotype.
     property Item dapLogotype
-    ///@detalis Menu bar width.
-    property alias dapMenuWidth: columnMenuTab.width
-    property alias dapLogotypeHeight: logotype.height
     ///@detalis Menu bar widget.
     property Item dapMenuWidget
     ///@detalis screen downloader widget.
@@ -39,13 +36,14 @@ Rectangle
                 id: logotype
                 data: dapLogotype
                 width: columnMenuTab.width
+                height: dapLogotype.height
             }
             // Menu bar widget
             Item
             {
                 id: menuWidget
                 data: dapMenuWidget
-                width: columnMenuTab.width
+                width: dapMenuWidget.width
                 height: columnMenuTab.height - logotype.height
             }
         }
diff --git a/DapRightPanelForm.ui.qml b/DapRightPanelForm.ui.qml
index 3f57d85..64b200a 100644
--- a/DapRightPanelForm.ui.qml
+++ b/DapRightPanelForm.ui.qml
@@ -11,18 +11,20 @@ Rectangle
     ///@detalis Right panel widget.
     property alias dapFrame: frameRightPanel
     ///@detalis Right pane title widget.
-    property alias dapHeader: header
+    property alias dapHeader: headerRightPanel
     ///@detalis Right pane header data.
     property Item dapHeaderData
     ///@detalis Stack of right panels owned by current.
-    property alias dapContentItemPanel: contentItemPanel
+    property alias dapContentPanel: contentItemRightPanel
     ///@detalis Content of the current right panel.
     property  Item dapContentItemData
+    
+    anchors.fill: parent
 
     // Install right panel title
     Item
     {
-        id: header
+        id: headerRightPanel
         data: dapHeaderData
         anchors.top: parent.top
         anchors.left: parent.left
@@ -31,9 +33,9 @@ Rectangle
     // Install right panel content
     Item
     {
-        id: contentItemPanel
+        id: contentItemRightPanel
         data: dapContentItemData
-        anchors.top: header.bottom
+        anchors.top: headerRightPanel.bottom
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
diff --git a/DapScreenForm.ui.qml b/DapScreenForm.ui.qml
index 9083647..e1d0342 100644
--- a/DapScreenForm.ui.qml
+++ b/DapScreenForm.ui.qml
@@ -7,10 +7,10 @@ import QtQuick.Controls 2.0
 
 Rectangle 
 {
-    id: frame
+    id: frameScreen
 
     ///@detalis Frame widget.
-    property alias dapFrame: frame
+    property alias dapFrame: frameScreen
     ///@detalis Screen components.
     property Item dapContenetItemScreen
 
@@ -21,5 +21,6 @@ Rectangle
     {
         id: contenetItemScreen
         data: dapContenetItemScreen
+        anchors.fill: parent
     }
 }
diff --git a/DapTabForm.ui.qml b/DapTabForm.ui.qml
index ddeeeb7..778f4fe 100644
--- a/DapTabForm.ui.qml
+++ b/DapTabForm.ui.qml
@@ -27,41 +27,41 @@ Rectangle
     {
         id: topPanel
         data: dapTopPanel
+        height: dapTopPanel.height
+        width: parent.width
         anchors.top: parent.top
         anchors.left: parent.left
         anchors.right: parent.right
     }
     // Install the screen widget and the right panel
-    Rectangle
+    Row
     {
         anchors.top: topPanel.bottom
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.bottom: parent.bottom
-        Row
-        {
-            anchors.fill: parent
 
-            // Screen widget
-            Item
-            {
-                id: screen
-                data: dapScreen
-                height: parent.height
-            }
-            // Separator widget
-            Rectangle
-            {
-                id: separator
-                height: parent.height
-            }
-            // Right pane widget
-            Item
-            {
-                id: rightPanel
-                data: dapRightPanel
-                height: parent.height
-            }
+        // Screen widget
+        Item
+        {
+            id: screen
+            data: dapScreen
+            height: parent.height
+            width: parent.width - separator.width - rightPanel.width
+        }
+        // Separator widget
+        Rectangle
+        {
+            id: separator
+            height: parent.height
+        }
+        // Right pane widget
+        Item
+        {
+            id: rightPanel
+            data: dapRightPanel
+            height: parent.height
+            width: dapRightPanel.width
         }
     }
 }
diff --git a/DapTopPanelForm.ui.qml b/DapTopPanelForm.ui.qml
index 4621384..aee9896 100644
--- a/DapTopPanelForm.ui.qml
+++ b/DapTopPanelForm.ui.qml
@@ -7,8 +7,8 @@ import QtQuick.Controls 2.0
 
 Rectangle 
 {
-    id: frame
+    id: frameTopPanel
     
     ///@detalis Top panel frame.
-    property alias dapFrame: frame
+    property alias dapFrame: frameTopPanel
 }
-- 
GitLab