mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: starting to handle user clipping regions, but first I will

Browse Source 
render better text, so I have something to test this on.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12761 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2018-03-16 17:53:09 +00:00
parent b6858cef56
commit 6c234ad12e
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/Android/Fl_Android_Graphics_Clipping.H
View File

@ -64,7 +64,7 @@ public:
bool is_empty() const;
bool is_infinite() const;
void set_empty();
virtual void set_empty();
void set(int x, int y, int w, int h);
void set_ltrb(int l, int t, int r, int b);
virtual void set(const Fl_Rect_Region &r);
@ -152,6 +152,7 @@ public:
virtual void set(const Fl_Rect_Region &r) override;
void set(const Fl_Complex_Region &r);
virtual void set_empty() override { delete pSubregion; pSubregion=0L; Fl_Rect_Region::set_empty(); }
Fl_Complex_Region *subregion() const { return pSubregion; }
Fl_Complex_Region *next() const { return pNext; }
Fl_Complex_Region *parent() const { return pParent; }

30
src/drivers/Android/Fl_Android_Graphics_Clipping.cxx
View File

@ -304,7 +304,7 @@ int Fl_Complex_Region::subtract(const Fl_Rect_Region &r)
// nothing to do
break;
case SAME:
set_empty(); // FIXME: delete this Rect!
set_empty(); // Will be deleted by compress()
break;
case LESS:
// split this rect into 1, 2, 3, or 4 new ones
@ -361,16 +361,15 @@ void Fl_Complex_Region::compress()
}
/**
* Subtract a rect from another rect, potentially creating four new rectangles.
* Subtract a smaller rect from a larger rect, potentially creating four new rectangles.
* This assumes that the calling region is NOT complex.
* @param r subtract the area of this rectangle.
* @param r subtract the area of this rectangle; r must fit within ``this``.
* @return currently 0, but this may change
*/
int Fl_Complex_Region::subtract_smaller_region(const Fl_Rect_Region &r)
{
// subtract a smaller rect from a larger rect and create subrects as needed
// FIXME: make sure that the bbox of the parent region is shrunk to the size of all children
// if there is only one single coordinte different, we can reuse this container
// if there is only one single coordinate different, we can reuse this container
if (left()==r.left() && top()==r.top() && right()==r.right() && bottom()==r.bottom()) {
// this should not happen
set_empty();
@ -647,12 +646,23 @@ void Fl_Android_Graphics_Driver::restore_clip()
{
fl_clip_state_number++;
pClippingRegion.set(pDesktopWindowRegion);
Fl_Region b = rstack[rstackptr];
// find the current user clipping rectangle
Fl_Region b = rstack[rstackptr]; // Fl_Region is a pointer to Fl_Rect_Region
if (b) {
// FIXME: pClippingRegion.intersect_with(*b);
if (b->is_empty()) {
// if this is an empty region, the intersection is always empty as well
pClippingRegion.set_empty();
} else {
// if there is a region, copy the full window region
pClippingRegion.set(pDesktopWindowRegion);
if (!b->is_infinite()) {
// if the rect has dimensions, calculate the intersection
pClippingRegion.intersect_with(*b);
}
}
} else {
// no rect? Just copy the window region
pClippingRegion.set(pDesktopWindowRegion);
}
}