[haiku-commits] r41206 - haiku/trunk/src/libs/icon

  • From: superstippi@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 8 Apr 2011 20:34:12 +0200 (CEST)

Author: stippi
Date: 2011-04-08 20:34:11 +0200 (Fri, 08 Apr 2011)
New Revision: 41206
Changeset: https://dev.haiku-os.org/changeset/41206

Modified:
   haiku/trunk/src/libs/icon/IconRenderer.cpp
Log:
Don't prevent shapes from being rendered when the global
icon scale is larger than the maximum visibility scale of
4.0f. This just means you cannot prevent shapes from
rendering in icons rendered larger than 256x256.
visibility scale is 4.0


Modified: haiku/trunk/src/libs/icon/IconRenderer.cpp
===================================================================
--- haiku/trunk/src/libs/icon/IconRenderer.cpp  2011-04-08 18:21:14 UTC (rev 
41205)
+++ haiku/trunk/src/libs/icon/IconRenderer.cpp  2011-04-08 18:34:11 UTC (rev 
41206)
@@ -347,10 +347,14 @@
        for (int32 i = 0; i < shapeCount; i++) {
                Shape* shape = fIcon->Shapes()->ShapeAtFast(i);
 
-               // don't render shape if the Level Of Detail falls out of range
+               // Don't render shape if the Level Of Detail falls out of range.
+               // That's unless the scale is bigger than the maximum
+               // MaxVisibilityScale of 4.0f.
                if (fGlobalTransform.scale() < shape->MinVisibilityScale()
-                       || fGlobalTransform.scale() > 
shape->MaxVisibilityScale())
+                       || (fGlobalTransform.scale() > 
shape->MaxVisibilityScale()
+                               && shape->MaxVisibilityScale() < 4.0f)) {
                        continue;
+               }
 
                Transformation transform(*shape);
                transform.multiply(fGlobalTransform);


Other related posts:

  • » [haiku-commits] r41206 - haiku/trunk/src/libs/icon - superstippi