2007-09-30 Matthew Allum <mallum@openedhand.com>

* clutter/clutter-event.h:
        Removed unused POINTER_ENTER and POINTER_LEAVE states. (#546)
        * clutter/clutter-stage.c: (clutter_stage_fullscreen),
        (clutter_stage_unfullscreen):
        Only Change fullscreen prop if the backend implements fullscreen
        methods. (#545)
This commit is contained in:
Matthew Allum 2007-09-30 22:27:52 +00:00
parent d93230d1bf
commit 956f6b6238
3 changed files with 22 additions and 13 deletions

View File

@ -1,3 +1,12 @@
2007-09-30 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-event.h:
Removed unused POINTER_ENTER and POINTER_LEAVE states. (#546)
* clutter/clutter-stage.c: (clutter_stage_fullscreen),
(clutter_stage_unfullscreen):
Only Change fullscreen prop if the backend implements fullscreen
methods. (#545)
2007-09-28 Øyvind Kolås <pippin@openedhand.com> 2007-09-28 Øyvind Kolås <pippin@openedhand.com>
* clutter/clutter-container.[ch]: added * clutter/clutter-container.[ch]: added

View File

@ -85,9 +85,7 @@ typedef enum
{ {
CLUTTER_STAGE_STATE_FULLSCREEN = (1<<1), CLUTTER_STAGE_STATE_FULLSCREEN = (1<<1),
CLUTTER_STAGE_STATE_OFFSCREEN = (1<<2), CLUTTER_STAGE_STATE_OFFSCREEN = (1<<2),
CLUTTER_STAGE_STATE_POINTER_ENTER = (1<<3), CLUTTER_STAGE_STATE_ACTIVATED = (1<<3)
CLUTTER_STAGE_STATE_POINTER_LEAVE = (1<<4),
CLUTTER_STAGE_STATE_ACTIVATED = (1<<5),
} ClutterStageState; } ClutterStageState;
typedef union _ClutterEvent ClutterEvent; typedef union _ClutterEvent ClutterEvent;

View File

@ -609,12 +609,13 @@ clutter_stage_fullscreen (ClutterStage *stage)
priv = stage->priv; priv = stage->priv;
if (!priv->is_fullscreen) if (!priv->is_fullscreen)
{ {
priv->is_fullscreen = TRUE; /* Only set if backend implements */
if (CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen) if (CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen)
CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen (stage, TRUE); {
priv->is_fullscreen = TRUE;
g_object_notify (G_OBJECT (stage), "fullscreen"); CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen (stage, TRUE);
g_object_notify (G_OBJECT (stage), "fullscreen");
}
} }
} }
@ -638,12 +639,13 @@ clutter_stage_unfullscreen (ClutterStage *stage)
priv = stage->priv; priv = stage->priv;
if (priv->is_fullscreen) if (priv->is_fullscreen)
{ {
priv->is_fullscreen = FALSE; /* Only set if backend implements */
if (CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen) if (CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen)
CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen (stage, FALSE); {
priv->is_fullscreen = FALSE;
g_object_notify (G_OBJECT (stage), "fullscreen"); CLUTTER_STAGE_GET_CLASS (stage)->set_fullscreen (stage, FALSE);
g_object_notify (G_OBJECT (stage), "fullscreen");
}
} }
} }