Move 'Fill and Stroke' widget to UI lib

friction2d · Sep 17, 2024 · 6fd1575 · 6fd1575
1 parent ce806a9
commit 6fd1575
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -195,7 +195,6 @@ set(
     GUI/graphboxeslist.cpp
     GUI/keysview.cpp
     GUI/mainwindow.cpp
-    GUI/fillstrokesettings.cpp
     GUI/toolbox.cpp
     GUI/extraactions.cpp
     GUI/effectactions.cpp
@@ -242,7 +241,6 @@ set(
     GUI/RenderWidgets/outputsettingsdisplaywidget.h
     GUI/animationdockwidget.h
     GUI/canvaswindow.h
-    GUI/fillstrokesettings.h
     GUI/keysview.h
     GUI/mainwindow.h
     GUI/window.h

diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
@@ -52,7 +52,7 @@
 #include "GUI/RenderWidgets/renderwidget.h"
 #include "GUI/global.h"
 #include "filesourcescache.h"
-#include "fillstrokesettings.h"
+#include "widgets/fillstrokesettings.h"
 #include "widgets/editablecombobox.h"
 
 #include "Sound/soundcomposition.h"

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
@@ -86,6 +86,7 @@ set(
     widgets/ecombobox.cpp
     widgets/editablecombobox.cpp
     widgets/fakemenubar.cpp
+    widgets/fillstrokesettings.cpp
     widgets/flowlayout.cpp
     widgets/fontswidget.cpp
     widgets/framespinbox.cpp
@@ -136,6 +137,7 @@ set(
     widgets/aboutwidget.h
     widgets/actionbutton.h
     widgets/alignwidget.h
+    widgets/fillstrokesettings.h
     widgets/framescrollbar.h
     widgets/assetswidget.h
     widgets/bookmarkedcolors.h

diff --git a/src/app/GUI/fillstrokesettings.cpp → src/ui/widgets/fillstrokesettings.cpp b/src/app/GUI/fillstrokesettings.cpp → src/ui/widgets/fillstrokesettings.cpp
diff --git a/src/app/GUI/fillstrokesettings.h → src/ui/widgets/fillstrokesettings.h b/src/app/GUI/fillstrokesettings.h → src/ui/widgets/fillstrokesettings.h
@@ -26,6 +26,8 @@
 #ifndef FILLSTROKESETTINGS_H
 #define FILLSTROKESETTINGS_H
 
+#include "ui_global.h"
+
 #include <QWidget>
 #include <QTabWidget>
 #include <QPushButton>
@@ -39,19 +41,15 @@
 
 #include "Animators/coloranimator.h"
 #include "Animators/paintsettingsanimator.h"
+#include "Private/document.h"
+#include "gradientwidgets/gradientwidget.h"
 #include "paintsettingsapplier.h"
 #include "Animators/brushsettingsanimator.h"
 #include "Paint/brushcontexedwrapper.h"
+#include "widgets/colorsettingswidget.h"
+#include "widgets/qrealanimatorvalueslider.h"
 
-class GradientWidget;
-class ColorSettingsWidget;
-class QrealAnimatorValueSlider;
-class ActionButton;
-class Segment1DEditor;
-class ColorSetting;
-class Document;
-
-class FillStrokeSettingsWidget : public QWidget
+class UI_EXPORT FillStrokeSettingsWidget : public QWidget
 {
     Q_OBJECT
     typedef qCubicSegment1DAnimator::Action SegAction;