From a2427fddd72f6c18c1609e50393950c8f2cb20ba Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 30 Jul 2017 22:46:58 +0200 Subject: GRAPHICS: MACGUI: Initial code for cursor drawing in MacTextWindow --- graphics/macgui/macwindow.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'graphics/macgui/macwindow.h') diff --git a/graphics/macgui/macwindow.h b/graphics/macgui/macwindow.h index 3db9096b9c..77be0aee19 100644 --- a/graphics/macgui/macwindow.h +++ b/graphics/macgui/macwindow.h @@ -228,7 +228,7 @@ public: * @param g See BaseMacWindow. * @param forceRedraw If true, the borders are guarranteed to redraw. */ - bool draw(ManagedSurface *g, bool forceRedraw = false); + virtual bool draw(ManagedSurface *g, bool forceRedraw = false); /** * Mutator to change the active state of the window. @@ -285,10 +285,7 @@ public: */ void setCloseable(bool closeable); - WindowClick isInBorder(int x, int y); - private: - void drawBorder(); void prepareBorderSurface(ManagedSurface *g); void drawSimpleBorder(ManagedSurface *g); void drawBorderFromSurface(ManagedSurface *g); @@ -302,10 +299,17 @@ private: bool isInResizeButton(int x, int y); WindowClick isInScroll(int x, int y); -private: +protected: + void drawBorder(); + WindowClick isInBorder(int x, int y); + +protected: ManagedSurface _borderSurface; ManagedSurface _composeSurface; + bool _borderIsDirty; + +private: MacWindowBorder _macBorder; int _pattern; @@ -314,7 +318,6 @@ private: bool _scrollable; bool _resizable; bool _active; - bool _borderIsDirty; bool _closeable; -- cgit v1.2.3