From 123b41232b7e5a7333d582926204ceda70760b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Wed, 12 Feb 2020 20:17:03 +0100 Subject: [PATCH] [WIP] Fixed Accessibility settings. Must be reverted --- kandinsky/Makefile | 1 + kandinsky/include/kandinsky/context.h | 11 ++++------- kandinsky/src/context.cpp | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 kandinsky/src/context.cpp diff --git a/kandinsky/Makefile b/kandinsky/Makefile index 9abbbc4f0..dfac55922 100644 --- a/kandinsky/Makefile +++ b/kandinsky/Makefile @@ -2,6 +2,7 @@ SFLAGS += -Ikandinsky/include kandinsky_src += $(addprefix kandinsky/src/,\ color.cpp \ + context.cpp \ context_line.cpp \ context_pixel.cpp \ context_rect.cpp \ diff --git a/kandinsky/include/kandinsky/context.h b/kandinsky/include/kandinsky/context.h index b8337245d..7f53e31bc 100644 --- a/kandinsky/include/kandinsky/context.h +++ b/kandinsky/include/kandinsky/context.h @@ -10,8 +10,10 @@ class KDPostProcessContext; class KDContext { friend KDPostProcessContext; public: - void setOrigin(KDPoint origin) { m_origin = origin; } - void setClippingRect(KDRect clippingRect) { m_clippingRect = clippingRect; } + KDPoint origin() const { return m_origin; } + KDRect clippingRect() const { return m_clippingRect; } + virtual void setOrigin(KDPoint origin); + virtual void setClippingRect(KDRect clippingRect); // Pixel manipulation void setPixel(KDPoint p, KDColor c); @@ -31,11 +33,6 @@ public: void fillRectWithPixels(KDRect rect, const KDColor * pixels, KDColor * workingBuffer); void blendRectWithMask(KDRect rect, KDColor color, const uint8_t * mask, KDColor * workingBuffer); void strokeRect(KDRect rect, KDColor color); -protected: - KDContext(KDPoint origin, KDRect clippingRect) : - m_origin(origin), - m_clippingRect(clippingRect) - {} virtual void pushRect(KDRect, const KDColor * pixels) = 0; virtual void pushRectUniform(KDRect rect, KDColor color) = 0; virtual void pullRect(KDRect rect, KDColor * pixels) = 0; diff --git a/kandinsky/src/context.cpp b/kandinsky/src/context.cpp new file mode 100644 index 000000000..5fed4fdc3 --- /dev/null +++ b/kandinsky/src/context.cpp @@ -0,0 +1,16 @@ +#include +#include + +KDContext::KDContext(KDPoint origin, KDRect clippingRect) : + m_origin(origin), + m_clippingRect(clippingRect) +{ +} + +void KDContext::setOrigin(KDPoint origin) { + m_origin = origin; +} + +void KDContext::setClippingRect(KDRect clippingRect) { + m_clippingRect = clippingRect; +} \ No newline at end of file