mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:27:34 +00:00
LibDraw: Introduce (formerly known as SharedGraphics.)
Instead of LibGUI and WindowServer building their own copies of the drawing and graphics code, let's it in a separate LibDraw library. This avoids building the code twice, and will encourage better separation of concerns. :^)
This commit is contained in:
parent
2167f60235
commit
1c0669f010
120 changed files with 201 additions and 190 deletions
|
@ -4,7 +4,7 @@
|
|||
#include <AK/CircularQueue.h>
|
||||
#include <AK/RefPtr.h>
|
||||
#include <AK/RefCounted.h>
|
||||
#include <SharedGraphics/Color.h>
|
||||
#include <LibDraw/Color.h>
|
||||
|
||||
class IRCLogBufferModel;
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "IRCLogBufferModel.h"
|
||||
#include "IRCLogBuffer.h"
|
||||
#include <SharedGraphics/Font.h>
|
||||
#include <LibDraw/Font.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <LibGUI/GButton.h>
|
||||
#include <LibGUI/GWidget.h>
|
||||
#include <LibGUI/GWindow.h>
|
||||
#include <SharedGraphics/GraphicsBitmap.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
|
|
|
@ -3,7 +3,7 @@ DEFINES += -DUSERLAND
|
|||
all: $(APP)
|
||||
|
||||
$(APP): $(OBJS)
|
||||
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc
|
||||
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -ldraw -laudio -lcore -lc
|
||||
|
||||
.cpp.o:
|
||||
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#include <AK/Queue.h>
|
||||
#include <AK/SinglyLinkedList.h>
|
||||
#include <LibGUI/GPainter.h>
|
||||
#include <SharedGraphics/GraphicsBitmap.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
#include <stdio.h>
|
||||
|
||||
BucketTool::BucketTool()
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "Tool.h"
|
||||
#include <SharedGraphics/Point.h>
|
||||
#include <LibDraw/Point.h>
|
||||
|
||||
class GMenu;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "PaintableWidget.h"
|
||||
#include "Tool.h"
|
||||
#include <LibGUI/GPainter.h>
|
||||
#include <SharedGraphics/GraphicsBitmap.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
|
||||
static PaintableWidget* s_the;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "Tool.h"
|
||||
#include <SharedGraphics/Point.h>
|
||||
#include <LibDraw/Point.h>
|
||||
|
||||
class GMenu;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#include "PickerTool.h"
|
||||
#include <SharedGraphics/GraphicsBitmap.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
|
||||
PickerTool::PickerTool()
|
||||
{
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include <LibGUI/GPainter.h>
|
||||
#include <LibGUI/GAction.h>
|
||||
#include <LibGUI/GMenu.h>
|
||||
#include <SharedGraphics/GraphicsBitmap.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
#include <stdio.h>
|
||||
#include <LibM/math.h>
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "EraseTool.h"
|
||||
#include <LibGUI/GBoxLayout.h>
|
||||
#include <LibGUI/GButton.h>
|
||||
#include <SharedGraphics/PNGLoader.h>
|
||||
#include <LibDraw/PNGLoader.h>
|
||||
|
||||
class ToolButton final : public GButton {
|
||||
public:
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <LibGUI/GMenuBar.h>
|
||||
#include <LibGUI/GMessageBox.h>
|
||||
#include <LibGUI/GWindow.h>
|
||||
#include <SharedGraphics/PNGLoader.h>
|
||||
#include <LibDraw/PNGLoader.h>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
|
|
|
@ -6,18 +6,4 @@ OBJS = \
|
|||
|
||||
APP = Piano
|
||||
|
||||
DEFINES += -DUSERLAND
|
||||
|
||||
all: $(APP)
|
||||
|
||||
$(APP): $(OBJS)
|
||||
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lgui -lcore -lc -laudio
|
||||
|
||||
.cpp.o:
|
||||
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<
|
||||
|
||||
-include $(OBJS:%.o=%.d)
|
||||
|
||||
clean:
|
||||
@echo "CLEAN"; rm -f $(APP) $(OBJS) *.d
|
||||
|
||||
include ../Makefile.common
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "PianoWidget.h"
|
||||
#include <AK/Queue.h>
|
||||
#include <LibGUI/GPainter.h>
|
||||
#include <SharedGraphics/GraphicsBitmap.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
#include <math.h>
|
||||
|
||||
PianoWidget::PianoWidget()
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <LibGUI/GBoxLayout.h>
|
||||
#include <LibGUI/GLabel.h>
|
||||
#include <LibGUI/GPainter.h>
|
||||
#include <SharedGraphics/StylePainter.h>
|
||||
#include <LibDraw/StylePainter.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "QSWidget.h"
|
||||
#include <LibGUI/GPainter.h>
|
||||
#include <SharedGraphics/GraphicsBitmap.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
|
||||
QSWidget::QSWidget(GWidget* parent)
|
||||
: GFrame(parent)
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include <LibGUI/GMenu.h>
|
||||
#include <LibGUI/GMenuBar.h>
|
||||
#include <LibGUI/GWindow.h>
|
||||
#include <SharedGraphics/PNGLoader.h>
|
||||
#include <LibDraw/PNGLoader.h>
|
||||
#include <stdio.h>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <AK/AKString.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <LibGUI/GButton.h>
|
||||
#include <SharedGraphics/Rect.h>
|
||||
#include <LibDraw/Rect.h>
|
||||
|
||||
class Window {
|
||||
public:
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <LibGUI/GClipboard.h>
|
||||
#include <LibGUI/GPainter.h>
|
||||
#include <LibGUI/GWindow.h>
|
||||
#include <SharedGraphics/Font.h>
|
||||
#include <LibDraw/Font.h>
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
#include <LibCore/CNotifier.h>
|
||||
#include <LibCore/CTimer.h>
|
||||
#include <LibGUI/GFrame.h>
|
||||
#include <SharedGraphics/GraphicsBitmap.h>
|
||||
#include <SharedGraphics/Rect.h>
|
||||
#include <LibDraw/GraphicsBitmap.h>
|
||||
#include <LibDraw/Rect.h>
|
||||
|
||||
class Font;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue