summaryrefslogtreecommitdiff
path: root/src/drivers/Android/Fl_Android_Graphics_Driver.H
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2018-03-14 21:46:01 +0000
committerMatthias Melcher <fltk@matthiasm.com>2018-03-14 21:46:01 +0000
commit737d8bef2425d0373a8890b49f9b0babb7f994db (patch)
treec8f001d89469dcc66831d4c3f633667910d950af /src/drivers/Android/Fl_Android_Graphics_Driver.H
parentc023f26fb0fd5107d520c2170c975d27ab7260f9 (diff)
Android: adding stress test for complex clipping.
Complex clipping is needed to allow popup dialogs and menu window while still correctly rendering windows that are "below" those popups. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12745 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/Android/Fl_Android_Graphics_Driver.H')
-rw-r--r--src/drivers/Android/Fl_Android_Graphics_Driver.H31
1 files changed, 15 insertions, 16 deletions
diff --git a/src/drivers/Android/Fl_Android_Graphics_Driver.H b/src/drivers/Android/Fl_Android_Graphics_Driver.H
index fd23e95d6..d229180c3 100644
--- a/src/drivers/Android/Fl_Android_Graphics_Driver.H
+++ b/src/drivers/Android/Fl_Android_Graphics_Driver.H
@@ -79,7 +79,6 @@ private:
Fl_Rect_Region& operator = (const Fl_Rect_Region& other);
};
-#if 0
/**
* The Fl_Complex_Region represents a clipping region of any shape.
*
@@ -99,23 +98,23 @@ private:
class Fl_Complex_Region : public Fl_Rect_Region
{
public:
- Fl_Complex_Region() : Fl_Rect_Region(), pSubregion(0L), pNext(0L) { }
- Fl_Complex_Region(int x, int y, int w, int h) : Fl_Rect_Region(x, y, w, h), pSubregion(0L), pNext(0L) { }
- ~Fl_Complex_Region();
- virtual void set(int x, int y, int w, int h);
- virtual void set(Fl_Rect_Region*);
- void subtract(Fl_Rect_Region*);
- void intersect(Fl_Rect_Region*);
- void clone(Fl_Complex_Region*);
- char is_simple() { return pSubregion==0; }
- char is_complex() { return pSubregion!=0; }
- void print();
+ Fl_Complex_Region();
+ Fl_Complex_Region(const Fl_Rect_Region&);
+ virtual ~Fl_Complex_Region() override;
+// virtual void set(int x, int y, int w, int h);
+// virtual void set(Fl_Rect_Region*);
+// void subtract(Fl_Rect_Region*);
+// void intersect(Fl_Rect_Region*);
+// void clone(Fl_Complex_Region*);
+ char is_simple() const { return pSubregion==0; }
+ char is_complex() const { return pSubregion!=0; }
+ virtual void print(const char*) const override;
protected:
- void print_data(int indent);
- Fl_Complex_Region *pSubregion;
- Fl_Complex_Region *pNext;
+ void print_data(int indent) const;
+ Fl_Complex_Region *pSubregion = 0L;
+ Fl_Complex_Region *pParent = 0L;
+ Fl_Complex_Region *pNext = 0L;
};
-#endif
/**