isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-23 16:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

actor: Finally fix RESIZE_ASPECT content gravity

Browse Source 
Ensure that resizing transitions smoothly when switching between major
axis; the allocation aspect ratio is not important: it's the size of the
allocation that dictates the major axis.
This commit is contained in:
Emmanuele Bassi 2012-05-29 15:39:59 +01:00
parent 7df4bfcf3b
commit b9533cb397
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
clutter/clutter-actor.c
View File

@ -18235,17 +18235,16 @@ clutter_actor_get_content_box (ClutterActor *self,
case CLUTTER_CONTENT_GRAVITY_RESIZE_ASPECT: case CLUTTER_CONTENT_GRAVITY_RESIZE_ASPECT:
{ {
double r_c = content_w / content_h; double r_c = content_w / content_h;
double r_a = alloc_w / alloc_h;
if (r_c >= 1.0) if (r_c >= 1.0)
{ {
if (r_a >= 1.0) if ((alloc_w / r_c) > alloc_h)
{ {
box->x1 = 0.f; box->x1 = 0.f;
box->x2 = alloc_w; box->x2 = alloc_w;
box->y1 = (alloc_h - (alloc_w * r_c)) / 2.0f; box->y1 = (alloc_h - (alloc_w / r_c)) / 2.0f;
box->y2 = box->y1 + (alloc_w * r_c); box->y2 = box->y1 + (alloc_w / r_c);
} }
else else
{ {
@ -18258,7 +18257,7 @@ clutter_actor_get_content_box (ClutterActor *self,
} }
else else
{ {
if (r_a >= 1.0) if ((alloc_w / r_c) > alloc_h)
{ {
box->y1 = 0.f; box->y1 = 0.f;
box->y2 = alloc_h; box->y2 = alloc_h;
@ -18271,10 +18270,19 @@ clutter_actor_get_content_box (ClutterActor *self,
box->x1 = 0.f; box->x1 = 0.f;
box->x2 = alloc_w; box->x2 = alloc_w;
box->y1 = (alloc_h - (alloc_w * r_c)) / 2.0f; box->y1 = (alloc_h - (alloc_w / r_c)) / 2.0f;
box->y2 = box->y1 + (alloc_w * r_c); box->y2 = box->y1 + (alloc_w / r_c);
} }
} }
CLUTTER_NOTE (LAYOUT,
"r_c: %.3f, r_a: %.3f\t"
"a: [%.2fx%.2f], c: [%.2fx%.2f]\t"
"b: [%.2f, %.2f, %.2f, %.2f]",
r_c, alloc_w / alloc_h,
alloc_w, alloc_h,
content_w, content_h,
box->x1, box->y1, box->x2, box->y2);
} }
break; break;
} }