isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

St: Use clutter_actor_get_request_mode

Browse Source 
Use clutter_actor_get_request_mode rather than g_object_get
since we have it in the required clutter version.

https://bugzilla.gnome.org/show_bug.cgi?id=640415
This commit is contained in:
Adel Gadllah 2011-01-23 15:20:43 +01:00
parent 1b383c7285
commit 8dcd70edbe
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/st/st-private.c
View File

@ -49,7 +49,7 @@ _st_actor_get_preferred_width (ClutterActor *actor,
ClutterRequestMode mode; ClutterRequestMode mode;
gfloat natural_height; gfloat natural_height;
g_object_get (G_OBJECT (actor), "request-mode", &mode, NULL); mode = clutter_actor_get_request_mode (actor);
if (mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT) if (mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
{ {
clutter_actor_get_preferred_height (actor, -1, NULL, &natural_height); clutter_actor_get_preferred_height (actor, -1, NULL, &natural_height);
@ -86,7 +86,7 @@ _st_actor_get_preferred_height (ClutterActor *actor,
ClutterRequestMode mode; ClutterRequestMode mode;
gfloat natural_width; gfloat natural_width;
g_object_get (G_OBJECT (actor), "request-mode", &mode, NULL); mode = clutter_actor_get_request_mode (actor);
if (mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH) if (mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
{ {
clutter_actor_get_preferred_width (actor, -1, NULL, &natural_width); clutter_actor_get_preferred_width (actor, -1, NULL, &natural_width);
@ -173,8 +173,7 @@ _st_allocate_fill (StWidget *parent,
* modified to cope with the fact that the available size may be * modified to cope with the fact that the available size may be
* less than the preferred size. * less than the preferred size.
*/ */
request = CLUTTER_REQUEST_HEIGHT_FOR_WIDTH; request = clutter_actor_get_request_mode (child);
g_object_get (G_OBJECT (child), "request-mode", &request, NULL);
if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH) if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
{ {