From 7c7cd02d7106dca88c0595320fb91cad898c09cc Mon Sep 17 00:00:00 2001
From: ArgonarioD <arnordorian@sina.com>
Date: Fri, 10 Mar 2023 16:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E4=BA=86LayerStyleDialog?=
 =?UTF-8?q?=E6=89=80=E5=9C=A8=E7=9A=84=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ArchitectureColoredPainting.vcxproj                |  4 ++--
 .../ArchitectureColoredPainting.vcxproj.filters        |  4 ++--
 .../{ => EditorWidgetComponent}/LayerStyleDialog.cpp   | 10 ++++++++--
 .../{ => EditorWidgetComponent}/LayerStyleDialog.h     |  0
 .../src/Editor/RightBar/InfoDisplayWidget.cpp          |  4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)
 rename ArchitectureColoredPainting/src/Editor/{ => EditorWidgetComponent}/LayerStyleDialog.cpp (80%)
 rename ArchitectureColoredPainting/src/Editor/{ => EditorWidgetComponent}/LayerStyleDialog.h (100%)

diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
index 3a40f7a..bc422d1 100644
--- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
+++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj
@@ -105,7 +105,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\Editor\EditorWidgetComponent\LayerCreateWidget.cpp" />
-    <ClCompile Include="src\Editor\LayerStyleDialog.cpp" />
+    <ClCompile Include="src\Editor\EditorWidgetComponent\LayerStyleDialog.cpp" />
     <ClCompile Include="src\Editor\EditorWidget.cpp" />
     <ClCompile Include="src\Editor\EditorWidgetItem.cpp" />
     <ClCompile Include="src\Editor\ElementManager.cpp" />
@@ -192,7 +192,7 @@
     <QtMoc Include="src\MainWindow.h" />
     <QtMoc Include="src\Editor\EditorWidget.h" />
     <QtMoc Include="src\Editor\EditorWidgetComponent\LayerCreateWidget.h" />
-    <QtMoc Include="src\Editor\LayerStyleDialog.h" />
+    <QtMoc Include="src\Editor\EditorWidgetComponent\LayerStyleDialog.h" />
     <ClInclude Include="src\Editor\ElementManager.h" />
     <QtMoc Include="src\Editor\ElementPoolWidget.h" />
     <ClInclude Include="src\Editor\GraphicElement.h" />
diff --git a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
index b24135f..f7e8d97 100644
--- a/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
+++ b/ArchitectureColoredPainting/ArchitectureColoredPainting.vcxproj.filters
@@ -219,7 +219,7 @@
     <ClCompile Include="src\Editor\EditorWidgetComponent\LayerCreateWidget.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\Editor\LayerStyleDialog.cpp">
+    <ClCompile Include="src\Editor\EditorWidgetComponent\LayerStyleDialog.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -260,7 +260,7 @@
     <QtMoc Include="src\Editor\EditorWidgetComponent\LayerCreateWidget.h">
       <Filter>Header Files</Filter>
     </QtMoc>
-    <QtMoc Include="src\Editor\LayerStyleDialog.h">
+    <QtMoc Include="src\Editor\EditorWidgetComponent\LayerStyleDialog.h">
       <Filter>Header Files</Filter>
     </QtMoc>
   </ItemGroup>
diff --git a/ArchitectureColoredPainting/src/Editor/LayerStyleDialog.cpp b/ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.cpp
similarity index 80%
rename from ArchitectureColoredPainting/src/Editor/LayerStyleDialog.cpp
rename to ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.cpp
index dfa7e5a..e1f3129 100644
--- a/ArchitectureColoredPainting/src/Editor/LayerStyleDialog.cpp
+++ b/ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.cpp
@@ -1,5 +1,6 @@
 #include "LayerStyleDialog.h"
 #include <QComboBox>
+#include <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include <QDebug>
@@ -19,8 +20,9 @@ LayerStyleDialog::LayerStyleDialog(
 	{
 		this->layerStyle = existedStyle;
 
-		QWidget* styleWidget = layerStyle->getInputWidget();
-		styleWidget->setParent(this);
+		this->styleContainer = nullptr;
+		this->styleWidget = layerStyle->getInputWidget();
+		this->styleWidget->setParent(this);
 		dialogLayout->addWidget(styleWidget);
 		// do something
 	}
@@ -59,6 +61,10 @@ LayerStyleDialog::LayerStyleDialog(
 				this, &LayerStyleDialog::onStyleTypeSelectorChanged);
 		}
 	}
+	QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+	connect(buttonBox, &QDialogButtonBox::accepted, this, &LayerStyleDialog::accept);
+	connect(buttonBox, &QDialogButtonBox::rejected, this, &LayerStyleDialog::reject);
+	dialogLayout->addWidget(buttonBox);
 }
 
 void LayerStyleDialog::onStyleTypeSelectorChanged(int index)
diff --git a/ArchitectureColoredPainting/src/Editor/LayerStyleDialog.h b/ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.h
similarity index 100%
rename from ArchitectureColoredPainting/src/Editor/LayerStyleDialog.h
rename to ArchitectureColoredPainting/src/Editor/EditorWidgetComponent/LayerStyleDialog.h
diff --git a/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp b/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
index 21bffff..0e86147 100644
--- a/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
+++ b/ArchitectureColoredPainting/src/Editor/RightBar/InfoDisplayWidget.cpp
@@ -1,5 +1,5 @@
 #include "InfoDisplayWidget.h"
-#include "LayerStyleDialog.h"
+#include "./EditorWidgetComponent/LayerStyleDialog.h"
 #include <QLineEdit>
 #include <QTextBlock>
 #include <QListWidget>
@@ -191,7 +191,7 @@ void InfoDisplayWidget::generateLayerForm()
                 removeButton->setFixedSize(QSize(20, 20));
 
                 connect(detailButton, &QPushButton::clicked, this,
-                    [=]()
+                    [this, styleIterator]()
                     {
                         LayerStyleDialog* dialog = new LayerStyleDialog(nullptr, *styleIterator);
                         dialog->exec();