isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

osx: Remove drawing call while showing stage and add viewport init

Browse Source 
Viewport didn't initialized before OGL drawing and it causes crash on
assert so added viewport initalization to
clutter_stage_osx_realize. Also showing the stage causes drawing
function but other part of the system(in particular conformance tests)
don't expect it and aren't ready at this moment.
This commit is contained in:
Roman Kudiyarov 2010-07-15 16:00:29 +07:00 committed by Robert Bragg
parent e3295050f5
commit 01c9570d16
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clutter/osx/clutter-stage-osx.c
View File

@ -276,7 +276,8 @@ clutter_stage_osx_realize (ClutterStageWindow *stage_window)
initWithView: self->view initWithView: self->view
UTF8Title: clutter_stage_get_title (CLUTTER_STAGE (self->wrapper)) UTF8Title: clutter_stage_get_title (CLUTTER_STAGE (self->wrapper))
stage: self]; stage: self];
/* all next operations will cause draw operation and viewport should be setup now */
_clutter_stage_maybe_setup_viewport(self->wrapper);
/* looks better than positioning to 0,0 (bottom right) */ /* looks better than positioning to 0,0 (bottom right) */
[self->window center]; [self->window center];
@ -322,6 +323,16 @@ clutter_stage_osx_show (ClutterStageWindow *stage_window,
clutter_actor_map (CLUTTER_ACTOR (self->wrapper)); clutter_actor_map (CLUTTER_ACTOR (self->wrapper));
clutter_stage_osx_set_frame (self); clutter_stage_osx_set_frame (self);
/* draw view should be avoided and it is the reason why
we should hide OpenGL view while we showing the stage.
*/
BOOL isViewHidden = [self->view isHidden];
if ( isViewHidden == NO)
{
[self->view setHidden:YES];
}
[self->window makeKeyAndOrderFront: nil];
[self->view setHidden:isViewHidden];
[self->window makeKeyAndOrderFront: nil]; [self->window makeKeyAndOrderFront: nil];