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

     int instance = inst;
     if (instance < 0)
         instance = 0;
-    else if ((size_t)instance > sr.size())
+    else if (static_cast<size_t>(instance) > sr.size())
-        instance = (int)sr.size() - 1;
+        instance = static_cast<int>(sr.size()) - 1;
     if (sr[instance].bs.empty())
+    {
         MSG_DEBUG("No border defined.");
         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;
     int numBorders = 0;
-    bool extBorder = false;
     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)
+    if (numBorders > 0)
-        extBorder = true;
-    if (extBorder)
+    {
         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, &imgB) || imgB.empty())
+        if (!retrieveImage(bd.b, bda.b, &imgB) || imgB.empty())
             return false;
         MSG_DEBUG("Got images " << bd.b << " and " << bda.b << " with size " << imgB.info().width() << " x " << imgB.info().height());
-        if (!retrieveImage(bd.br, &imgBR) || imgBR.empty())
+        if (!retrieveImage(bd.br, bda.br, &imgBR) || imgBR.empty())
             return false;
         MSG_DEBUG("Got images " << bd.br << " and " << bda.br << " with size " << imgBR.info().width() << " x " << imgBR.info().height());
-        if (!retrieveImage(bd.r, &imgR) || imgR.empty())
+        if (!retrieveImage(bd.r, bda.r, &imgR) || imgR.empty())
             return false;
         MSG_DEBUG("Got images " << bd.r << " and " << bda.r << " with size " << imgR.info().width() << " x " << imgR.info().height());
-        if (!retrieveImage(bd.tr, &imgTR) || imgTR.empty())
+        if (!retrieveImage(bd.tr, bda.tr, &imgTR) || imgTR.empty())
             return false;
         MSG_DEBUG("Got images " << bd.tr << " and " << bda.tr << " with size " << imgTR.info().width() << " x " << imgTR.info().height());
-        if (!retrieveImage(bd.t, &imgT) || imgT.empty())
+        if (!retrieveImage(bd.t, bda.t, &imgT) || imgT.empty())
             return false;
         MSG_DEBUG("Got images " << bd.t << " and " << bda.t << " with size " << imgT.info().width() << " x " << imgT.info().height());
-        if (!retrieveImage(bd.tl, &imgTL) || imgTL.empty())
+        if (!retrieveImage(bd.tl, bda.tl, &imgTL) || imgTL.empty())
             return false;
         MSG_DEBUG("Got images " << bd.tl << " and " << bda.tl << " with size " << imgTL.info().width() << " x " << imgTL.info().height());
-        if (!retrieveImage(bd.l, &imgL) || imgL.empty())
+        if (!retrieveImage(bd.l, bda.l, &imgL) || 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());
-        if (!retrieveImage(bd.bl, &imgBL) || imgBL.empty())
+        if (!retrieveImage(bd.bl, bda.bl, &imgBL) || imgBL.empty())
             return false;
         MSG_DEBUG("Got images " << bd.bl << " and " << bda.bl << " 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);
         SkCanvas target(*bm, SkSurfaceProps());
         SkCanvas canvas(frame, SkSurfaceProps());
         SkPaint paint;
         paint.setBlendMode(SkBlendMode::kSrcOver);
-        sk_sp<SkImage> _image = SkImages::RasterFromBitmap(imgB);
+        sk_sp<SkImage> _image = SkImages::RasterFromBitmap(imgB);   // bottom
         canvas.drawImage(_image, imgBL.info().width(), ht - imgB.info().height(), SkSamplingOptions(), &paint);
-        _image = SkImages::RasterFromBitmap(imgBR);
+        _image = SkImages::RasterFromBitmap(imgT);                  // top
+        canvas.drawImage(_image, imgTL.info().width(), 0, SkSamplingOptions(), &paint);
+        _image = SkImages::RasterFromBitmap(imgL);                  // left
-        canvas.drawImage(_image, wt - imgBR.info().width(), ht - imgBR.info().height(), SkSamplingOptions(), &paint);
+        canvas.drawImage(_image, 0, imgTL.info().height(), SkSamplingOptions(), &paint);
-        _image = SkImages::RasterFromBitmap(imgR);
+        _image = SkImages::RasterFromBitmap(imgR);                  // right
         canvas.drawImage(_image, wt - imgR.info().width(), imgTR.info().height(), SkSamplingOptions(), &paint);
+        _image = SkImages::RasterFromBitmap(imgBR);                 // bottom right
+        canvas.drawImage(_image, wt - imgBR.info().width(), ht - imgBR.info().height(), SkSamplingOptions(), &paint);
-        _image = SkImages::RasterFromBitmap(imgTR);
+        _image = SkImages::RasterFromBitmap(imgTR);                 // top right
         canvas.drawImage(_image, wt - imgTR.info().width(), 0, SkSamplingOptions(), &paint);
-        _image = SkImages::RasterFromBitmap(imgT);
-        canvas.drawImage(_image, imgTL.info().width(), 0, SkSamplingOptions(), &paint);
-        _image = SkImages::RasterFromBitmap(imgTL);
+        _image = SkImages::RasterFromBitmap(imgTL);                 // top left
         canvas.drawImage(_image, 0, 0, SkSamplingOptions(), &paint);
-        _image = SkImages::RasterFromBitmap(imgL);
-        canvas.drawImage(_image, 0, imgTL.info().height(), SkSamplingOptions(), &paint);
-        _image = SkImages::RasterFromBitmap(imgBL);
+        _image = SkImages::RasterFromBitmap(imgBL);                 // bottom left
         canvas.drawImage(_image, 0, ht - imgBL.info().height(), SkSamplingOptions(), &paint);
-        erasePart(bm, frame, Border::ERASE_OUTSIDE);
+        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);
+    }
+    }
     return true;
+}
+bool TButton::retrieveImage(const string& path, const string& pathAlpha, SkBitmap* image)
+{
+    DECL_TRACER("TButton::retrieveImage(const string& path, const string& pathAlpha, SkBitmap* image)");
+    sk_sp<SkData> im;
+    SkBitmap bm;
+    if (!(im = readImage(path)))
+        return false;
+    DecodeDataToBitmap(im, image);
+    if (image->empty())
+    {
+        MSG_WARNING("Could not create the image " << path);
+        return false;
+    }
+    if (pathAlpha.empty())
+        return true;
+    if (!(im = readImage(pathAlpha)))
+        return true;
+    DecodeDataToBitmap(im, &bm);
+    if (bm.empty())
+    {
+        MSG_WARNING("Could not create alpha mask image " << pathAlpha);
+        return true;
+    }
+    if (image->info().dimensions() == bm.info().dimensions())
+    {
+        for (int x = 0; x < image->info().width(); ++x)
+        {
+            for (int y = 0; y < image->info().height(); ++y)
+            {
+                uint32_t *pixImage = image->getAddr32(x, y);
+                SkColor colImage = image->getColor(x, y);
+                SkColor colAlpha = bm.getColor(x, y);
+                SkColor alpha = SkColorGetA(colImage);
+                if (alpha == 0)
+                    *pixImage = colAlpha;
+            }
+        }
+    }
+    else
+    {
+        SkPaint paint;
+        paint.setBlendMode(SkBlendMode::kSoftLight);
+        SkCanvas can(*image);
+        sk_sp<SkImage> _image = SkImages::RasterFromBitmap(bm);
+        can.drawImage(_image, 0, 0, SkSamplingOptions(), &paint);
+    }
+    return true;
+}
 void TButton::show()
+{
     DECL_TRACER("TButton::show()");
     // First we detect whether we have a dynamic button or not.
                 msg = "Enter [" + intToString(pp) + "] password";
             else
                 msg = "Enter password for user " + mUser;
             mPassword.clear();
-            gPageManager->getAskPassword()(mHandle, msg, "Password");
+            gPageManager->getAskPassword()(mHandle, msg, "Password", x, y);
             return true;
+        }
         else
             return false;
+    }

Subversion Repositories tpanel

(root)/trunk/tbutton.cpp @ 401 – Rev 400 → 401