diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | src/Fl_Double_Window.cxx | 12 | ||||
| -rw-r--r-- | src/Fl_Overlay_Window.cxx | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.3.0 + - Fixed X11/XDBE double buffering (STR #2152, #2197) - Added new label and image alignments (STR #2269) - Added documentation for event delivery (STR #1983) - Fixed menu and tooltip window animation bug under X11 (compiz) diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx index bd2155329..88ccfd962 100644 --- a/src/Fl_Double_Window.cxx +++ b/src/Fl_Double_Window.cxx @@ -296,7 +296,7 @@ void Fl_Double_Window::flush(int eraseoverlay) { } #if USE_XDBE if (use_xdbe) { - if (myi->backbuffer_bad) { + if (myi->backbuffer_bad || eraseoverlay) { // Make sure we do a complete redraw... if (myi->region) {XDestroyRegion(myi->region); myi->region = 0;} clear_damage(FL_DAMAGE_ALL); @@ -360,7 +360,15 @@ void Fl_Double_Window::resize(int X,int Y,int W,int H) { int oh = h(); Fl_Window::resize(X,Y,W,H); #if USE_XDBE - if (use_xdbe) return; + if (use_xdbe) { + Fl_X* myi = Fl_X::i(this); + if (myi && myi->other_xid && (ow < w() || oh < h())) { + // STR #2152: Deallocate the back buffer to force creation of a new one. + XdbeDeallocateBackBufferName(fl_display,myi->other_xid); + myi->other_xid = 0; + } + return; + } #endif Fl_X* myi = Fl_X::i(this); if (myi && myi->other_xid && (ow != w() || oh != h())) { diff --git a/src/Fl_Overlay_Window.cxx b/src/Fl_Overlay_Window.cxx index 8acb4af35..581c7057d 100644 --- a/src/Fl_Overlay_Window.cxx +++ b/src/Fl_Overlay_Window.cxx @@ -61,7 +61,7 @@ void Fl_Overlay_Window::flush() { return; } #endif - int erase_overlay = (damage()&FL_DAMAGE_OVERLAY); + int erase_overlay = (damage()&FL_DAMAGE_OVERLAY) | (overlay_ == this); clear_damage((uchar)(damage()&~FL_DAMAGE_OVERLAY)); Fl_Double_Window::flush(erase_overlay); if (overlay_ == this) draw_overlay(); |