WebSVN – tpanel – Diff – /trunk/tbutton.cpp

 #include "tlock.h"
 #if TESTMODE == 1
 #include "testmode.h"
 #endif
+#if __cplusplus < 201402L
+#   error "This module requires at least C++14 standard!"
+#else
+#   if __cplusplus < 201703L
+#       include <experimental/filesystem>
+namespace fs = std::experimental::filesystem;
+#       warning "Support for C++14 and experimental filesystem will be removed in a future version!"
+#   else
+#       include <filesystem>
+#       ifdef __ANDROID__
+namespace fs = std::__fs::filesystem;
+#       else
+namespace fs = std::filesystem;
+#       endif
+#   endif
+#endif
 using std::exception;
 using std::string;
 using std::vector;
 using std::unique_ptr;
 using std::map;
         return true;
     // The border was not found or defined to be not drawn. Therefor we look
     // into the system directory (__system/graphics/borders). If the wanted
     // border exists there, we're drawing it.
-    BORDER_t bd, bda;
+    BORDER_t bd;
     int numBorders = 0;
     if (sr.size() == 2)
+    {
         if (gPageManager->getSystemDraw()->getBorder(bname, TSystemDraw::LT_OFF, &bd))
             numBorders++;
-        if (gPageManager->getSystemDraw()->getBorder(bname, TSystemDraw::LT_ON, &bda))
-            numBorders++;
+    }
     else if (gPageManager->getSystemDraw()->getBorder(bname, TSystemDraw::LT_ON, &bd))
         numBorders++;
     if (numBorders > 0)
         SkColor color = TColor::getSkiaColor(sr[instance].cb);      // border color
         MSG_DEBUG("Button color: #" << std::setw(6) << std::setfill('0') << std::hex << color);
         // Load images
         SkBitmap imgB, imgBR, imgR, imgTR, imgT, imgTL, imgL, imgBL;
-        if (!retrieveImage(bd.b, bda.b, &imgB, color) || imgB.empty())
+        if (!getBorderFragment(bd.b, bd.b_alpha, &imgB, color) || imgB.empty())
             return false;
-        MSG_DEBUG("Got images " << bd.b << " and " << bda.b << " with size " << imgB.info().width() << " x " << imgB.info().height());
+        MSG_DEBUG("Got images " << bd.b << " and " << bd.b_alpha << " with size " << imgB.info().width() << " x " << imgB.info().height());
-        if (!retrieveImage(bd.br, bda.br, &imgBR, color) || imgBR.empty())
+        if (!getBorderFragment(bd.br, bd.br_alpha, &imgBR, color) || imgBR.empty())
             return false;
-        MSG_DEBUG("Got images " << bd.br << " and " << bda.br << " with size " << imgBR.info().width() << " x " << imgBR.info().height());
+        MSG_DEBUG("Got images " << bd.br << " and " << bd.br_alpha << " with size " << imgBR.info().width() << " x " << imgBR.info().height());
-        if (!retrieveImage(bd.r, bda.r, &imgR, color) || imgR.empty())
+        if (!getBorderFragment(bd.r, bd.r_alpha, &imgR, color) || imgR.empty())
             return false;
-        MSG_DEBUG("Got images " << bd.r << " and " << bda.r << " with size " << imgR.info().width() << " x " << imgR.info().height());
+        MSG_DEBUG("Got images " << bd.r << " and " << bd.r_alpha << " with size " << imgR.info().width() << " x " << imgR.info().height());
-        if (!retrieveImage(bd.tr, bda.tr, &imgTR, color) || imgTR.empty())
+        if (!getBorderFragment(bd.tr, bd.tr_alpha, &imgTR, color) || imgTR.empty())
             return false;
-        MSG_DEBUG("Got images " << bd.tr << " and " << bda.tr << " with size " << imgTR.info().width() << " x " << imgTR.info().height());
+        MSG_DEBUG("Got images " << bd.tr << " and " << bd.tr_alpha << " with size " << imgTR.info().width() << " x " << imgTR.info().height());
-        if (!retrieveImage(bd.t, bda.t, &imgT, color) || imgT.empty())
+        if (!getBorderFragment(bd.t, bd.t_alpha, &imgT, color) || imgT.empty())
             return false;
-        MSG_DEBUG("Got images " << bd.t << " and " << bda.t << " with size " << imgT.info().width() << " x " << imgT.info().height());
+        MSG_DEBUG("Got images " << bd.t << " and " << bd.t_alpha << " with size " << imgT.info().width() << " x " << imgT.info().height());
-        if (!retrieveImage(bd.tl, bda.tl, &imgTL, color) || imgTL.empty())
+        if (!getBorderFragment(bd.tl, bd.tl_alpha, &imgTL, color) || imgTL.empty())
             return false;
-        MSG_DEBUG("Got images " << bd.tl << " and " << bda.tl << " with size " << imgTL.info().width() << " x " << imgTL.info().height());
+        MSG_DEBUG("Got images " << bd.tl << " and " << bd.tl_alpha << " with size " << imgTL.info().width() << " x " << imgTL.info().height());
-        if (!retrieveImage(bd.l, bda.l, &imgL, color) || imgL.empty())
+        if (!getBorderFragment(bd.l, bd.l_alpha, &imgL, color) || imgL.empty())
             return false;
         mBorderWidth = imgL.info().width();
-        MSG_DEBUG("Got images " << bd.l << " and " << bda.l << " with size " << imgL.info().width() << " x " << imgL.info().height());
+        MSG_DEBUG("Got images " << bd.l << " and " << bd.l_alpha << " with size " << imgL.info().width() << " x " << imgL.info().height());
-        if (!retrieveImage(bd.bl, bda.bl, &imgBL, color) || imgBL.empty())
+        if (!getBorderFragment(bd.bl, bd.bl_alpha, &imgBL, color) || imgBL.empty())
             return false;
-        MSG_DEBUG("Got images " << bd.bl << " and " << bda.bl << " with size " << imgBL.info().width() << " x " << imgBL.info().height());
+        MSG_DEBUG("Got images " << bd.bl << " and " << bd.bl_alpha << " with size " << imgBL.info().width() << " x " << imgBL.info().height());
         MSG_DEBUG("Button image size: " << (imgTL.info().width() + imgT.info().width() + imgTR.info().width()) << " x " << (imgTL.info().height() + imgL.info().height() + imgBL.info().height()));
         MSG_DEBUG("Total size: " << wt << " x " << ht);
         stretchImageWidth(&imgB, wt - imgBL.info().width() - imgBR.info().width());
         stretchImageWidth(&imgT, wt - imgTL.info().width() - imgTR.info().width());
         stretchImageHeight(&imgL, ht - imgTL.info().height() - imgBL.info().height());
         SkCanvas target(*bm, SkSurfaceProps());
         SkCanvas canvas(frame, SkSurfaceProps());
         SkPaint paint;
         paint.setBlendMode(SkBlendMode::kSrcOver);
+        paint.setAntiAlias(true);
         sk_sp<SkImage> _image = SkImages::RasterFromBitmap(imgB);   // bottom
         canvas.drawImage(_image, imgBL.info().width(), ht - imgB.info().height(), SkSamplingOptions(), &paint);
         _image = SkImages::RasterFromBitmap(imgT);                  // top
         canvas.drawImage(_image, imgTL.info().width(), 0, SkSamplingOptions(), &paint);
         _image = SkImages::RasterFromBitmap(imgBR);                 // bottom right
         canvas.drawImage(_image, 0, imgTL.info().height(), SkSamplingOptions(), &paint);
         _image = SkImages::RasterFromBitmap(imgR);                  // right
         canvas.drawImage(_image, wt - imgR.info().width(), imgTR.info().height(), SkSamplingOptions(), &paint);
         erasePart(bm, frame, Border::ERASE_OUTSIDE, imgL.info().width());
-//        backgroundFrame(bm, frame, color);
         _image = SkImages::RasterFromBitmap(frame);
         paint.setBlendMode(SkBlendMode::kSrcATop);
         target.drawImage(_image, 0, 0, SkSamplingOptions(), &paint);
+    }
     else    // We try to draw a frame by forcing it to draw even the not to draw marked frames.
+    }
     return maskBm;
+}
-SkBitmap TButton::retrieveBorderImage(const string& pa, const string& pb, SkColor color, SkColor bgColor)
-{
-    DECL_TRACER("TButton::retrieveBorderImage(const string& pa, const string& pb, SkColor color, SkColor bgColor)");
-    SkBitmap bm, bma;
-    if (!pa.empty() && !retrieveImage(pa, &bm))
-        return SkBitmap();
-    if (!pb.empty() && !retrieveImage(pb, &bma))
-        return bm;
-//        return SkBitmap();
-    return colorImage(bm, bma, color, bgColor, false);
-}
 bool TButton::retrieveImage(const string& path, SkBitmap* image)
+{
     DECL_TRACER("TButton::retrieveImage(const string& path, SkBitmap* image)");
+    if (!fs::exists(path) || !fs::is_regular_file(path))
+    {
+        MSG_WARNING("File " << path << " does not exist or is not a regular file!");
+        return false;
+    }
     sk_sp<SkData> im;
     if (!(im = readImage(path)))
         return false;
     return true;
+}
 /**
- * @brief retrieveImage - get border
+ * @brief getBorderFragment - get part of border
- * The method reads a particular border image from the disk and converts it to
+ * The method reads a border image fragment from the disk and converts it to
- * the border color. If there is a base image and a alpha mask image, the pixels
+ * the border color. If there is a base image and an alpha mask image, the
- * of the alpha mask are converted to the border color and then the base image
+ * pixels of the alpha mask are converted to the border color and then the base
- * is layed over the mask image.
+ * image is layed over the mask image.
  * In case there is no base image, an image with the same size as the mask image
  * is created and filled transparaent.
+ *
  * @param path      The path and file name of the base image.
  * @param pathAlpha The path and file name of the alpha mask image.
  * @param color     The border color
+ *
  * @return In case the images exists and were loaded successfully, TRUE is
  * returned.
  */
-bool TButton::retrieveImage(const string& path, const string& pathAlpha, SkBitmap* image, SkColor color)
+bool TButton::getBorderFragment(const string& path, const string& pathAlpha, SkBitmap* image, SkColor color)
+{
-    DECL_TRACER("TButton::retrieveImage(const string& path, const string& pathAlpha, SkBitmap* image, SkColor color)");
+    DECL_TRACER("TButton::getBorderFragment(const string& path, const string& pathAlpha, SkBitmap* image, SkColor color)");
+    if (!image)
+    {
+        MSG_ERROR("Invalid pointer to image!");
+        return false;
+    }
     sk_sp<SkData> im;
     SkBitmap bm;
     bool haveBaseImage = false;
+    // If the path ends with "alpha.png" then it is a mask image. This not what
+    // we want first unless this is the only image available.
     if (!endsWith(path, "alpha.png") || pathAlpha.empty())
+    {
-        if (!(im = readImage(path)))
+        if (retrieveImage(path, image))
+        {
+            haveBaseImage = true;
+            // Underly the pixels with the border color
+            MSG_DEBUG("Path: " << path << ", pathAlpha: " << pathAlpha);
+            if (pathAlpha.empty() || !fs::exists(pathAlpha) || path == pathAlpha)
+            {
+                SkImageInfo info = image->info();
-            return false;
+                SkBitmap b;
+                allocPixels(info.width(), info.height(), &b);
+                b.eraseColor(SK_ColorTRANSPARENT);
-        DecodeDataToBitmap(im, image);
+                for (int x = 0; x < info.width(); ++x)
+                {
+                    for (int y = 0; y < info.height(); ++y)
+                    {
+                        SkColor alpha = SkColorGetA(image->getColor(x, y));
+                        uint32_t *pix = b.getAddr32(x, y);
-        if (image->empty())
+                        if (alpha > 0)
-        {
-            MSG_WARNING("Could not create the image " << path);
+                            *pix = color;
-            return false;
+                    }
-        }
+                }
-        haveBaseImage = true;
+                SkPaint paint;
+                paint.setAntiAlias(true);
+                paint.setBlendMode(SkBlendMode::kDstATop);
+                SkCanvas can(*image);
+                sk_sp<SkImage> _image = SkImages::RasterFromBitmap(b);
+                can.drawImage(_image, 0, 0, SkSamplingOptions(), &paint);
+            }
+        }
+    }
+    // If there is no valid path return.
     if (pathAlpha.empty())
-        return true;
-    if (!(im = readImage(pathAlpha)))
-        return true;
+        return haveBaseImage;
-    DecodeDataToBitmap(im, &bm);
+    // On error retrieving the image, return.
-    if (bm.empty())
+    if (!retrieveImage(pathAlpha, &bm))
-    {
-        MSG_WARNING("Could not create alpha mask image " << pathAlpha);
-        return true;
+        return haveBaseImage;
-    }
+    // If there was no base image loaded, allocate the space for an image
+    // filled transparent. Make it the same size as the mask image.
     if (!haveBaseImage)
+    {
         allocPixels(bm.info().width(), bm.info().height(), image);
         image->eraseColor(SK_ColorTRANSPARENT);
+    }
+    // Only if the base image and the mask image have the same size, which
+    // should be the case, then the visible pixels of the mask image are
+    // colored by the border color.
     if (image->info().dimensions() == bm.info().dimensions())
+    {
         for (int y = 0; y < image->info().height(); ++y)
+        {
             for (int x = 0; x < image->info().width(); ++x)
                     *pix = SkColorSetA(color, alpha);
+            }
+        }
+    }
+    // Here we draw the border fragment over the base image.
     SkPaint paint;
+    paint.setAntiAlias(true);
     paint.setBlendMode(SkBlendMode::kDstATop);
     SkCanvas can(*image);
     sk_sp<SkImage> _image = SkImages::RasterFromBitmap(bm);
     can.drawImage(_image, 0, 0, SkSamplingOptions(), &paint);

Subversion Repositories tpanel

(root)/trunk/tbutton.cpp @ 406 – Rev 403 → 404