LibGUI: Remove some header dependencies from Widget.h

luteresa · Feb 14, 2020 · 34c7322 · 34c7322
1 parent 08cae27
commit 34c7322
Show file tree

Hide file tree

Showing 36 changed files with 84 additions and 33 deletions.
diff --git a/Applications/About/main.cpp b/Applications/About/main.cpp
@@ -30,8 +30,9 @@
 #include <LibGUI/Desktop.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Window.h>
-#include <sys/utsname.h>
+#include <LibGfx/Font.h>
 #include <stdio.h>
+#include <sys/utsname.h>
 
 int main(int argc, char** argv)
 {

diff --git a/Applications/FontEditor/GlyphEditorWidget.cpp b/Applications/FontEditor/GlyphEditorWidget.cpp
@@ -26,6 +26,7 @@
 
 #include "GlyphEditorWidget.h"
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
 
 GlyphEditorWidget::GlyphEditorWidget(Gfx::Font& mutable_font, GUI::Widget* parent)
  : GUI::Frame(parent)

diff --git a/Applications/FontEditor/GlyphMapWidget.cpp b/Applications/FontEditor/GlyphMapWidget.cpp
@@ -25,8 +25,9 @@
  */
 
 #include "GlyphMapWidget.h"
-#include <LibGfx/Palette.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
 
 GlyphMapWidget::GlyphMapWidget(Gfx::Font& mutable_font, GUI::Widget* parent)
  : GUI::Frame(parent)

diff --git a/Applications/FontEditor/main.cpp b/Applications/FontEditor/main.cpp
@@ -31,6 +31,7 @@
 #include <LibGUI/MenuBar.h>
 #include <LibGUI/Window.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

diff --git a/Applications/HexEditor/HexEditor.h b/Applications/HexEditor/HexEditor.h
@@ -33,6 +33,7 @@
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/StdLibExtras.h>
 #include <LibGUI/ScrollableWidget.h>
+#include <LibGfx/Font.h>
 #include <LibGfx/TextAlignment.h>
 
 class HexEditor : public GUI::ScrollableWidget {

diff --git a/Applications/PaintBrush/PaletteWidget.cpp b/Applications/PaintBrush/PaletteWidget.cpp
@@ -28,6 +28,7 @@
 #include "PaintableWidget.h"
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/ColorPicker.h>
+#include <LibGfx/Palette.h>
 
 class ColorWidget : public GUI::Frame {
  C_OBJECT(ColorWidget)

diff --git a/Applications/SystemMonitor/GraphWidget.cpp b/Applications/SystemMonitor/GraphWidget.cpp
@@ -26,6 +26,7 @@
 
 #include "GraphWidget.h"
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
 
 GraphWidget::GraphWidget(GUI::Widget* parent)
  : GUI::Frame(parent)

diff --git a/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Applications/SystemMonitor/MemoryStatsWidget.cpp
@@ -28,10 +28,11 @@
 #include "GraphWidget.h"
 #include <AK/JsonObject.h>
 #include <LibCore/File.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/StylePainter.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp
@@ -39,6 +39,7 @@
 #include <LibGUI/Slider.h>
 #include <LibGUI/Widget.h>
 #include <LibGUI/Window.h>
+#include <LibGfx/Font.h>
 #include <LibVT/TerminalWidget.h>
 #include <assert.h>
 #include <errno.h>

diff --git a/Applications/Welcome/TextWidget.cpp b/Applications/Welcome/TextWidget.cpp
@@ -28,8 +28,9 @@
 #include <AK/String.h>
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
-#include <LibGfx/Palette.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
 
 TextWidget::TextWidget(GUI::Widget* parent)
  : GUI::Frame(parent)

diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp
@@ -33,6 +33,7 @@
 #include <LibGUI/Label.h>
 #include <LibGUI/StackWidget.h>
 #include <LibGUI/Window.h>
+#include <LibGfx/Font.h>
 #include <LibGfx/PNGLoader.h>
 
 #include "TextWidget.h"

diff --git a/DevTools/HackStudio/CursorTool.cpp b/DevTools/HackStudio/CursorTool.cpp
@@ -29,6 +29,7 @@
 #include "FormWidget.h"
 #include "WidgetTreeModel.h"
 #include <AK/LogStream.h>
+#include <LibGfx/Palette.h>
 
 void CursorTool::on_mousedown(GUI::MouseEvent& event)
 {

diff --git a/DevTools/HackStudio/ProcessStateWidget.cpp b/DevTools/HackStudio/ProcessStateWidget.cpp
@@ -29,6 +29,7 @@
 #include <LibCore/Timer.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
+#include <LibGfx/Font.h>
 #include <unistd.h>
 
 ProcessStateWidget::ProcessStateWidget(GUI::Widget* parent)

diff --git a/Games/Snake/SnakeGame.cpp b/Games/Snake/SnakeGame.cpp
@@ -28,6 +28,7 @@
 #include <LibGUI/FontDatabase.h>
 #include <LibGUI/Painter.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
 #include <stdlib.h>
 #include <time.h>
 

diff --git a/Libraries/LibGUI/AboutDialog.cpp b/Libraries/LibGUI/AboutDialog.cpp
@@ -29,6 +29,7 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Widget.h>
+#include <LibGfx/Font.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/AbstractTableView.h b/Libraries/LibGUI/AbstractTableView.h
@@ -37,7 +37,7 @@ class TableCellPaintingDelegate {
 public:
  virtual ~TableCellPaintingDelegate() {}
 
- virtual void paint(Painter&, const Gfx::Rect&, const Palette&, const Model&, const ModelIndex&) = 0;
+ virtual void paint(Painter&, const Gfx::Rect&, const Gfx::Palette&, const Model&, const ModelIndex&) = 0;
 };
 
 class AbstractTableView : public AbstractView {

diff --git a/Libraries/LibGUI/Application.cpp b/Libraries/LibGUI/Application.cpp
@@ -24,7 +24,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Palette.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/Desktop.h>
@@ -33,6 +32,8 @@
 #include <LibGUI/Painter.h>
 #include <LibGUI/Window.h>
 #include <LibGUI/WindowServerConnection.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/Button.cpp b/Libraries/LibGUI/Button.cpp
@@ -26,11 +26,13 @@
 
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/Action.h>
 #include <LibGUI/ActionGroup.h>
 #include <LibGUI/Button.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/CheckBox.cpp b/Libraries/LibGUI/CheckBox.cpp
@@ -25,11 +25,12 @@
  */
 
 #include <Kernel/KeyCode.h>
+#include <LibGUI/CheckBox.h>
+#include <LibGUI/Painter.h>
 #include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Font.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>
-#include <LibGUI/CheckBox.h>
-#include <LibGUI/Painter.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/ColorPicker.cpp b/Libraries/LibGUI/ColorPicker.cpp
@@ -30,6 +30,7 @@
 #include <LibGUI/Frame.h>
 #include <LibGUI/SpinBox.h>
 #include <LibGUI/Widget.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/ColumnsView.cpp b/Libraries/LibGUI/ColumnsView.cpp
@@ -24,10 +24,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/CharacterBitmap.h>
 #include <LibGUI/ColumnsView.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ScrollBar.h>
+#include <LibGfx/CharacterBitmap.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/Frame.cpp b/Libraries/LibGUI/Frame.cpp
@@ -24,9 +24,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/Frame.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/GroupBox.cpp b/Libraries/LibGUI/GroupBox.cpp
@@ -24,10 +24,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Palette.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/GroupBox.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/Label.cpp b/Libraries/LibGUI/Label.cpp
@@ -24,10 +24,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Bitmap.h>
-#include <LibGfx/Palette.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Painter.h>
+#include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/MessageBox.cpp b/Libraries/LibGUI/MessageBox.cpp
@@ -28,6 +28,7 @@
 #include <LibGUI/Button.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/MessageBox.h>
+#include <LibGfx/Font.h>
 #include <stdio.h>
 
 namespace GUI {

diff --git a/Libraries/LibGUI/ProgressBar.cpp b/Libraries/LibGUI/ProgressBar.cpp
@@ -28,6 +28,7 @@
 #include <AK/StringBuilder.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ProgressBar.h>
+#include <LibGfx/Palette.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/RadioButton.cpp b/Libraries/LibGUI/RadioButton.cpp
@@ -24,10 +24,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Bitmap.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/RadioButton.h>
+#include <LibGfx/Bitmap.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/Slider.cpp b/Libraries/LibGUI/Slider.cpp
@@ -28,6 +28,7 @@
 #include <AK/StdLibExtras.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/Slider.h>
+#include <LibGfx/Palette.h>
 #include <LibGfx/StylePainter.h>
 
 namespace GUI {

diff --git a/Libraries/LibGUI/StatusBar.cpp b/Libraries/LibGUI/StatusBar.cpp
@@ -24,12 +24,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Label.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/ResizeCorner.h>
 #include <LibGUI/StatusBar.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/TabWidget.cpp b/Libraries/LibGUI/TabWidget.cpp
@@ -24,11 +24,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibGfx/Palette.h>
-#include <LibGfx/StylePainter.h>
 #include <LibGUI/BoxLayout.h>
 #include <LibGUI/Painter.h>
 #include <LibGUI/TabWidget.h>
+#include <LibGfx/Font.h>
+#include <LibGfx/Palette.h>
+#include <LibGfx/StylePainter.h>
 
 namespace GUI {
 

diff --git a/Libraries/LibGUI/Widget.cpp b/Libraries/LibGUI/Widget.cpp
@@ -94,6 +94,8 @@ const WidgetClassRegistration* WidgetClassRegistration::find(const String& class
 
 Widget::Widget(Widget* parent)
  : Core::Object(parent, true)
+ , m_background_role(Gfx::ColorRole::Window)
+ , m_foreground_role(Gfx::ColorRole::WindowText)
  , m_font(Gfx::Font::default_font())
  , m_palette(Application::the().palette().impl())
 {
@@ -731,4 +733,19 @@ void Widget::set_palette(const Palette& palette)
  m_palette = palette.impl();
 }
 
+void Widget::set_background_role(ColorRole role)
+{
+ m_background_role = role;
+}
+
+void Widget::set_foreground_role(ColorRole role)
+{
+ m_foreground_role = role;
+}
+
+Gfx::Palette Widget::palette() const
+{
+ return Gfx::Palette(*m_palette);
+}
+
 }