* skins2: fixed the xkeepratio/ykeepratio attributes for controls not tied to

   the top left corner of the layout

diff --git a/modules/gui/skins2/parser/builder.cpp b/modules/gui/skins2/parser/builder.cpp
index 569010e4d8e8358fd2facd5198bf52eecc34bc4f..f35f844992d17269b9649d532903308a210e5388 100644 (file)
--- a/modules/gui/skins2/parser/builder.cpp
+++ b/modules/gui/skins2/parser/builder.cpp
@@ -1027,6 +1027,21 @@ const Position Builder::makePosition( const string &rLeftTop,
         refRightBottom = Position::kRightBottom;
     }
 
+    // In "keep ratio" mode, overwrite the previously computed values with the
+    // actual ones
+    // XXX: this coupling between makePosition and the Position class should
+    // be reduced...
+    if( xKeepRatio )
+    {
+        left = xPos;
+        right = xPos + width;
+    }
+    if( yKeepRatio )
+    {
+        top = yPos;
+        bottom = yPos + height;
+    }
+
     return Position( left, top, right, bottom, rBox, refLeftTop,
                      refRightBottom, xKeepRatio, yKeepRatio );
 }