From 526f33ceba3a79831d0912ec615732558d2f172e Mon Sep 17 00:00:00 2001
From: wuyize <wuyize25@163.com>
Date: Tue, 7 Mar 2023 20:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=AF=BC=E8=88=AA=E6=94=B9=E7=94=A8St?=
 =?UTF-8?q?ackedWidget?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArchitectureColoredPainting.vcxproj       |  2 +-
 ...rchitectureColoredPainting.vcxproj.filters |  2 +-
 ArchitectureColoredPainting/MainWindow.ui     | 68 +++----------------
 .../{ => src/Editor}/ElementPoolWidget.cpp    |  0
 .../src/MainWindow.cpp                        | 13 ++--
 5 files changed, 17 insertions(+), 68 deletions(-)
 rename ArchitectureColoredPainting/{ => src/Editor}/ElementPoolWidget.cpp (100%)

diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
index 368ffbe..5082e4f 100644
--- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
+++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
@@ -104,10 +104,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="ElementPoolWidget.cpp" />
     <ClCompile Include="src\CaptionButton.cpp" />
     <ClCompile Include="src\Editor\EditorWidget.cpp" />
     <ClCompile Include="src\Editor\ElementManager.cpp" />
+    <ClCompile Include="src\Editor\ElementPoolWidget.cpp" />
     <ClCompile Include="src\Editor\GraphicElement.cpp" />
     <ClCompile Include="src\Editor\LayerManager.cpp" />
     <ClCompile Include="src\Editor\LayerStyle.cpp" />
diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
index 3aed4a1..92d4cef 100644
--- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
+++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
@@ -207,7 +207,7 @@
     <ClCompile Include="src\Editor\PixelPath.cpp">
       <Filter>Source Files\Editor</Filter>
     </ClCompile>
-    <ClCompile Include="ElementPoolWidget.cpp">
+    <ClCompile Include="src\Editor\ElementPoolWidget.cpp">
       <Filter>Source Files\Editor</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/ArchitectureColoredPainting/MainWindow.ui b/ArchitectureColoredPainting/MainWindow.ui
index f661869..101be92 100644
--- a/ArchitectureColoredPainting/MainWindow.ui
+++ b/ArchitectureColoredPainting/MainWindow.ui
@@ -40,66 +40,20 @@
      <number>0</number>
     </property>
     <item>
-     <layout class="QVBoxLayout" name="verticalLayout_4" stretch="1">
-      <property name="spacing">
-       <number>0</number>
-      </property>
+     <layout class="QGridLayout" name="gridLayout">
       <property name="sizeConstraint">
        <enum>QLayout::SetDefaultConstraint</enum>
       </property>
-      <item>
-       <widget class="QTabWidget" name="tabWidget">
-        <property name="font">
-         <font>
-          <family>Segoe UI, Microsoft YaHei UI</family>
-          <pointsize>10</pointsize>
-          <weight>50</weight>
-          <italic>false</italic>
-          <bold>false</bold>
-         </font>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">
-           QTabBar::tab {
-           height: 0px;
-           margin-top:0px;
-           }
-           QTabWidget::tab-bar
-           {
-           height: 0px;
-           top:0px;
-           }
-           QTabWidget::pane {
-           border: 0px;
-           background-color: transparent;
-           }
-         </string>
-        </property>
-        <property name="tabPosition">
-         <enum>QTabWidget::North</enum>
-        </property>
-        <property name="tabShape">
-         <enum>QTabWidget::Rounded</enum>
-        </property>
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <property name="elideMode">
-         <enum>Qt::ElideNone</enum>
-        </property>
-        <property name="tabsClosable">
-         <bool>false</bool>
-        </property>
-        <widget class="EditorWidget" name="editorWidget">
-         <attribute name="title">
-          <string>纹理编辑</string>
-         </attribute>
-        </widget>
-        <widget class="Renderer::RendererWidget" name="rendererWidget">
-         <attribute name="title">
-          <string>场景渲染</string>
-         </attribute>
-        </widget>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QStackedWidget" name="stackedWidget">
+        <widget class="EditorWidget" name="editorWidget"/>
+        <widget class="Renderer::RendererWidget" name="rendererWidget"/>
        </widget>
       </item>
      </layout>
diff --git a/ArchitectureColoredPainting/ElementPoolWidget.cpp b/ArchitectureColoredPainting/src/Editor/ElementPoolWidget.cpp
similarity index 100%
rename from ArchitectureColoredPainting/ElementPoolWidget.cpp
rename to ArchitectureColoredPainting/src/Editor/ElementPoolWidget.cpp
diff --git a/ArchitectureColoredPainting/src/MainWindow.cpp b/ArchitectureColoredPainting/src/MainWindow.cpp
index f671133..505f1dd 100644
--- a/ArchitectureColoredPainting/src/MainWindow.cpp
+++ b/ArchitectureColoredPainting/src/MainWindow.cpp
@@ -15,14 +15,9 @@ CentralWidget::CentralWidget(QWidget* parent) : QMainWindow(parent)
 {
 	ui.setupUi(this);
 	NavigationBarWidget* navigationBarWidget = new NavigationBarWidget();
-
-	QHBoxLayout* tabBarLayout = new QHBoxLayout(ui.tabWidget);
-	tabBarLayout->setSpacing(0);
-	tabBarLayout->setMargin(0);
-	tabBarLayout->addWidget(navigationBarWidget, 0, Qt::AlignTop | Qt::AlignHCenter);
-
-	QObject::connect(navigationBarWidget->tabs, &QtMaterialTabs::currentChanged, ui.tabWidget, &QTabWidget::setCurrentIndex);
-	QObject::connect(ui.tabWidget, &QTabWidget::currentChanged,
+	ui.gridLayout->addWidget(navigationBarWidget, 0, 0, 1, 1, Qt::AlignTop | Qt::AlignHCenter);
+	QObject::connect(navigationBarWidget->tabs, &QtMaterialTabs::currentChanged, ui.stackedWidget, &QStackedWidget::setCurrentIndex);
+	QObject::connect(ui.stackedWidget, &QStackedWidget::currentChanged,
 		ui.rendererWidget, &Renderer::RendererWidget::currentTabChanged);
 }
 
@@ -41,7 +36,7 @@ MainWindow::MainWindow(QWidget* parent, const Qt::WindowFlags flags)
 	m_titleBar->maximizeButton()->setFixedHeight(kTitleBarHeight);
 	m_titleBar->closeButton()->setFixedHeight(kTitleBarHeight);
 	m_titleBar->setTitleFont(QFont(QString("Segoe UI, Microsoft YaHei UI"), 10));
-	m_titleBar->chromePalette()->setTitleBarActiveBackgroundColor(QColor(0,0,0,0));
+	m_titleBar->chromePalette()->setTitleBarActiveBackgroundColor(QColor(0, 0, 0, 0));
 	m_titleBar->chromePalette()->setTitleBarInactiveBackgroundColor(QColor(0, 0, 0, 0));
 
 	m_central_widget = new CentralWidget();