summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2015-01-04 14:41:50 +0000
committerManolo Gouy <Manolo>2015-01-04 14:41:50 +0000
commit7f7e84b6968a464bad54f9ee87a2a35ddf3d9ca4 (patch)
tree0e07de3609e625210fb9e020a8e31d70e3f0eac9
parent8862df495007676f47ba4d858dba748733c79196 (diff)
Simplified Fl_X::flush() for GL windows.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10507 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_cocoa.mm17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 323a634bf..34a2908af 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2767,15 +2767,14 @@ void Fl_Window::fullscreen_off_x(int X, int Y, int W, int H) {
*/
void Fl_X::flush()
{
- if (through_drawRect) {
- if (w->as_gl_window()) {
- w->flush();
- } else {
- make_current_counts = 1;
- w->flush();
- make_current_counts = 0;
- Fl_X::q_release_context();
- }
+ if (w->as_gl_window()) {
+ w->flush();
+ return;
+ } else if (through_drawRect) {
+ make_current_counts = 1;
+ w->flush();
+ make_current_counts = 0;
+ Fl_X::q_release_context();
return;
}
// have Cocoa immediately redraw the window's view