mirror of
https://github.com/brl/mutter.git
synced 2024-12-25 04:22:05 +00:00
cogl-path: Renames cogl_path_get/set cogl_get/set_path
These aren't path methods so aren't consistent with the cogl_object_method naming style we are aiming for.
This commit is contained in:
parent
63eeaa86ea
commit
368dc48372
@ -235,7 +235,7 @@ cogl_clip_push_from_path_preserve (void)
|
|||||||
|
|
||||||
cogl_get_modelview_matrix (&modelview_matrix);
|
cogl_get_modelview_matrix (&modelview_matrix);
|
||||||
|
|
||||||
_cogl_clip_stack_push_from_path (stack, cogl_path_get (),
|
_cogl_clip_stack_push_from_path (stack, cogl_get_path (),
|
||||||
&modelview_matrix);
|
&modelview_matrix);
|
||||||
|
|
||||||
clip_state->stack_dirty = TRUE;
|
clip_state->stack_dirty = TRUE;
|
||||||
|
@ -1060,29 +1060,6 @@ cogl_path_rel_curve_to (float x_1,
|
|||||||
data->path_pen.y + y_3);
|
data->path_pen.y + y_3);
|
||||||
}
|
}
|
||||||
|
|
||||||
CoglPath *
|
|
||||||
cogl_path_get (void)
|
|
||||||
{
|
|
||||||
_COGL_GET_CONTEXT (ctx, NULL);
|
|
||||||
|
|
||||||
return ctx->current_path;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
cogl_path_set (CoglPath *path)
|
|
||||||
{
|
|
||||||
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
|
||||||
|
|
||||||
if (!cogl_is_path (path))
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* Reference the new object first in case it is the same as the old
|
|
||||||
object */
|
|
||||||
cogl_object_ref (path);
|
|
||||||
cogl_object_unref (ctx->current_path);
|
|
||||||
ctx->current_path = path;
|
|
||||||
}
|
|
||||||
|
|
||||||
CoglPath *
|
CoglPath *
|
||||||
_cogl_path_new (void)
|
_cogl_path_new (void)
|
||||||
{
|
{
|
||||||
@ -1241,3 +1218,27 @@ cogl_rel_curve2_to (float x_1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
CoglPath *
|
||||||
|
cogl_get_path (void)
|
||||||
|
{
|
||||||
|
_COGL_GET_CONTEXT (ctx, NULL);
|
||||||
|
|
||||||
|
return ctx->current_path;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
cogl_set_path (CoglPath *path)
|
||||||
|
{
|
||||||
|
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
|
||||||
|
|
||||||
|
if (!cogl_is_path (path))
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* Reference the new object first in case it is the same as the old
|
||||||
|
object */
|
||||||
|
cogl_object_ref (path);
|
||||||
|
cogl_object_unref (ctx->current_path);
|
||||||
|
ctx->current_path = path;
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -368,7 +368,7 @@ cogl_path_round_rectangle (float x_1,
|
|||||||
float arc_step);
|
float arc_step);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cogl_path_get:
|
* cogl_get_path:
|
||||||
*
|
*
|
||||||
* Gets a pointer to the current path. The path can later be used
|
* Gets a pointer to the current path. The path can later be used
|
||||||
* again by calling cogl_path_set(). Note that the path isn't copied
|
* again by calling cogl_path_set(). Note that the path isn't copied
|
||||||
@ -382,10 +382,10 @@ cogl_path_round_rectangle (float x_1,
|
|||||||
* Since: 1.4
|
* Since: 1.4
|
||||||
*/
|
*/
|
||||||
CoglPath *
|
CoglPath *
|
||||||
cogl_path_get (void);
|
cogl_get_path (void);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cogl_path_set:
|
* cogl_set_path:
|
||||||
* @path: A #CoglPath object
|
* @path: A #CoglPath object
|
||||||
*
|
*
|
||||||
* Replaces the current path with @path. A reference is taken on the
|
* Replaces the current path with @path. A reference is taken on the
|
||||||
@ -395,7 +395,7 @@ cogl_path_get (void);
|
|||||||
* Since: 1.4
|
* Since: 1.4
|
||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
cogl_path_set (CoglPath *path);
|
cogl_set_path (CoglPath *path);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cogl_path_copy:
|
* cogl_path_copy:
|
||||||
|
@ -155,8 +155,8 @@ cogl_polygon
|
|||||||
|
|
||||||
<SUBSECTION>
|
<SUBSECTION>
|
||||||
cogl_path_new
|
cogl_path_new
|
||||||
cogl_path_get
|
cogl_get_path
|
||||||
cogl_path_set
|
cogl_set_path
|
||||||
cogl_path_copy
|
cogl_path_copy
|
||||||
cogl_path_move_to
|
cogl_path_move_to
|
||||||
cogl_path_close
|
cogl_path_close
|
||||||
|
Loading…
Reference in New Issue
Block a user