libgui|Image: Image point ratio parameter

An Image can specify a ratio for converting image pixels to layout points.

“@2x” images will automatically get a 0.5 point ratio.

doomsday/sdk/libgui/include/de/graphics/image.h

@@ -143,6 +143,16 @@ class LIBGUI_PUBLIC Image : public ISerializable
 
     GLPixelFormat glFormat() const;
 
+    /**
+     * Returns the ratio of how many points there are for each image pixel.
+     * This can be used to scale the image appropriately for the UI.
+     *
+     * @return Points per image pixel.
+     */
+    float pointRatio() const;
+
+    void setPointRatio(float pointsPerPixel);
+
     // Drawing/editing methods.
     Image subImage(Rectanglei const &subArea) const;
     void resize(Size const &size);

doomsday/sdk/libgui/include/de/graphics/imagebank.h

@@ -50,7 +50,7 @@ class LIBGUI_PUBLIC ImageBank : public InfoBank
     void add(DotPath const &path, String const &imageFilePath);
     void addFromInfo(File const &file);
 
-    Image const &image(DotPath const &path) const;
+    const Image &image(DotPath const &path) const;
 
 protected:
     ISource *newSourceFromInfo(String const &id);

doomsday/sdk/libgui/src/graphics/image.cpp

@@ -338,20 +338,22 @@ DENG2_PIMPL(Image)
     QImage image;
     Block pixels;
     ByteRefArray refPixels;
+    float pointRatio = 1.f;
 
     Impl(Public *i, QImage const &img = QImage())
         : Base(i), format(UseQImageFormat), image(img)
     {
         size = Size(img.width(), img.height());
     }
 
-    Impl(Public *i, Impl const &other)
-        : Base     (i),
-          format   (other.format),
-          size     (other.size),
-          image    (other.image),
-          pixels   (other.pixels),
-          refPixels(other.refPixels)
+    Impl(Public * i, Impl const &other)
+        : Base(i)
+        , format(other.format)
+        , size(other.size)
+        , image(other.image)
+        , pixels(other.pixels)
+        , refPixels(other.refPixels)
+        , pointRatio(other.pointRatio)
     {}
 
     Impl(Public *i, Size const &imgSize, Format imgFormat, IByteArray const &imgPixels)
@@ -367,7 +369,7 @@ Image::Image() : d(new Impl(this))
 {}
 
 Image::Image(Image const &other)
-    : de::ISerializable(), d(new Impl(this, *other.d))
+    : d(new Impl(this, *other.d))
 {}
 
 Image::Image(QImage const &image) : d(new Impl(this, image))
@@ -381,7 +383,7 @@ Image::Image(Size const &size, Format format, ByteRefArray const &refPixels)
     : d(new Impl(this, size, format, refPixels))
 {}
 
-Image &Image::operator = (Image const &other)
+Image &Image::operator=(Image const &other)
 {
     d.reset(new Impl(this, *other.d));
     return *this;
@@ -452,7 +454,7 @@ int Image::stride() const
     {
         return d->image.bytesPerLine();
     }
-    return depth()/8 * d->size.x;
+    return depth() / 8 * d->size.x;
 }
 
 int Image::byteCount() const
@@ -465,7 +467,7 @@ int Image::byteCount() const
     {
         return d->pixels.size();
     }
-    return depth()/8 * d->size.x * d->size.y;
+    return depth() / 8 * d->size.x * d->size.y;
 }
 
 void const *Image::bits() const
@@ -587,6 +589,16 @@ GLPixelFormat Image::glFormat() const
     return glFormat(d->format);
 }
 
+float Image::pointRatio() const
+{
+    return d->pointRatio;
+}
+
+void Image::setPointRatio(float pointsPerPixel)
+{
+    d->pointRatio = pointsPerPixel;
+}
+
 Image Image::subImage(Rectanglei const &subArea) const
 {
     IMAGE_ASSERT_EDITABLE(d);

doomsday/sdk/libgui/src/graphics/imagebank.cpp

@@ -18,7 +18,8 @@
 
 #include "de/ImageBank"
 #include "de/App"
-#include "de/Folder"
+#include "de/FileSystem"
+#include "de/ImageFile"
 
 #include <de/ScriptedInfo>
 
@@ -29,8 +30,12 @@ DENG2_PIMPL_NOREF(ImageBank)
     struct ImageSource : public ISource
     {
         String filePath;
+        float  pointRatio;
 
-        ImageSource(String const &path) : filePath(path) {}
+        ImageSource(String const &path, float pointRatio)
+            : filePath(path)
+            , pointRatio(pointRatio)
+        {}
 
         Time modifiedAt() const
         {
@@ -39,9 +44,12 @@ DENG2_PIMPL_NOREF(ImageBank)
 
         Image load() const
         {
-            Block imageData;
-            App::rootFolder().locate<File const>(filePath) >> imageData;
-            return Image::fromData(imageData);
+            Image img = FS::locate<const ImageFile>(filePath).image();
+            if (pointRatio > 0)
+            {
+                img.setPointRatio(pointRatio);
+            }
+            return img;
         }
     };
 
@@ -59,7 +67,7 @@ DENG2_PIMPL_NOREF(ImageBank)
 
         duint sizeInMemory() const
         {
-            return image.byteCount();
+            return duint(image.byteCount());
         }
     };
 };
@@ -69,7 +77,7 @@ ImageBank::ImageBank(Flags const &flags) : InfoBank("ImageBank", flags), d(new I
 
 void ImageBank::add(DotPath const &path, String const &imageFilePath)
 {
-    Bank::add(path, new Impl::ImageSource(imageFilePath));
+    Bank::add(path, new Impl::ImageSource(imageFilePath, 0.f));
 }
 
 void ImageBank::addFromInfo(File const &file)
@@ -87,7 +95,8 @@ Image const &ImageBank::image(DotPath const &path) const
 Bank::ISource *ImageBank::newSourceFromInfo(String const &id)
 {
     Record const &def = info()[id];
-    return new Impl::ImageSource(absolutePathInContext(def, def["path"]));
+    return new Impl::ImageSource(absolutePathInContext(def, def["path"]),
+                                 def.getf("pointRatio", 0.f));
 }
 
 Bank::IData *ImageBank::loadFromSource(ISource &source)

doomsday/sdk/libgui/src/graphics/imagefile.cpp

@@ -40,7 +40,7 @@ DENG2_PIMPL(ImageFile)
 
     ~Impl()
     {
-        qDeleteAll(filtered.values());
+        qDeleteAll(filtered);
     }
 
     ImageFile *makeOrGetFiltered(BuiltInFilter filter)
@@ -169,7 +169,12 @@ Image ImageFile::image() const
     }
     else
     {
-        return Image::fromData(*source(), extension());
+        Image img = Image::fromData(*source(), extension());
+        if (source()->name().contains("@2x.", Qt::CaseInsensitive))
+        {
+            img.setPointRatio(.5f);
+        }
+        return img;
     }
 }
 

doomsday/sdk/libgui/src/graphics/packageiconbank.cpp

@@ -68,6 +68,7 @@ DENG2_PIMPL_NOREF(PackageIconBank)
                     img.resize(_displaySize);
                 }
             }
+            img.setPointRatio(1.f);
             return img;
         }