mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/cocoa: Always update our viewport if Cocoa tells us something has changed

Browse source 
The visible rect and bounds might be the same as before, but Cocoa
might've changed our viewport without us nothing. This happens if
you hide the view and show it again.
This commit is contained in:
Sebastian Dröge 2014-10-01 16:04:36 +03:00 committed by Tim-Philipp Müller
parent b44798d549
commit 435810b238
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
View file

@ -85,7 +85,6 @@ struct _GstGLWindowCocoaPrivate
GMainLoop *loop;
GLint viewport_dim[4];
NSRect bounds, visibleRect;
};
static void
@ -524,25 +523,17 @@ resize_cb (gpointer data)
[glContext update];
if (window_cocoa->priv->bounds.size.width != resize_data->bounds.size.width ||
window_cocoa->priv->bounds.size.height != resize_data->bounds.size.height ||
window_cocoa->priv->visibleRect.origin.x != resize_data->visibleRect.origin.x ||
window_cocoa->priv->visibleRect.origin.y != resize_data->visibleRect.origin.y) {
gl = context->gl_vtable;
gl = context->gl_vtable;
if (window->resize) {
window->resize (window->resize_data, resize_data->bounds.size.width, resize_data->bounds.size.height);
gl->GetIntegerv (GL_VIEWPORT, window_cocoa->priv->viewport_dim);
}
gl->Viewport (window_cocoa->priv->viewport_dim[0] - resize_data->visibleRect.origin.x,
window_cocoa->priv->viewport_dim[1] - resize_data->visibleRect.origin.y,
window_cocoa->priv->viewport_dim[2], window_cocoa->priv->viewport_dim[3]);
window_cocoa->priv->visibleRect = resize_data->visibleRect;
window_cocoa->priv->bounds = resize_data->bounds;
if (window->resize) {
window->resize (window->resize_data, resize_data->bounds.size.width, resize_data->bounds.size.height);
gl->GetIntegerv (GL_VIEWPORT, window_cocoa->priv->viewport_dim);
}
gl->Viewport (window_cocoa->priv->viewport_dim[0] - resize_data->visibleRect.origin.x,
window_cocoa->priv->viewport_dim[1] - resize_data->visibleRect.origin.y,
window_cocoa->priv->viewport_dim[2], window_cocoa->priv->viewport_dim[3]);
GST_GL_WINDOW (window_cocoa)->draw (GST_GL_WINDOW (window_cocoa)->draw_data);
[glContext flushBuffer];
}