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

 #include <string>
 #include <memory>
 #include <algorithm>
 #include <codecvt>
+#include <fstream>
 #include <include/core/SkPixmap.h>
 #include <include/core/SkSize.h>
 #include <include/core/SkColor.h>
 #include <include/core/SkFont.h>
 #include <include/effects/SkImageFilters.h>
 #include <include/core/SkPath.h>
 #include <include/core/SkSurfaceProps.h>
 #include <include/core/SkFilterQuality.h>
 #include <include/core/SkMaskFilter.h>
+#include <include/core/SkImageEncoder.h>
 #ifdef __ANDROID__
 #include <QtAndroidExtras/QAndroidJniObject>
 #include <QtAndroid>
 #endif
     bool classExist = (gPageManager && gPageManager->getSystemDraw());
     if ((classExist && borderIndex >= 0 && !sysBorders[borderIndex].calc) || (classExist && borderIndex < 0))
+    {
         int numBorders = 0;
+        bool extBorder = false;
         string borderName1 = (bs.empty() ? sr[instance].bs : bs);
         string borderName2 = (!bs.empty() && !sr[instance].bs.empty() ? sr[instance].bs : bs);
-MSG_DEBUG("Searching for borders \"" << borderName1 << "\" and \"" << borderName2 << "\"");
-        if (gPageManager->getSystemDraw()->getBorder(borderName1, TSystemDraw::LT_OFF, &bd))
-            numBorders++;
+        if (bs.empty())
+        {
+            if (gPageManager->getSystemDraw()->getBorder(sr[instance].bs, TSystemDraw::LT_OFF, &bd))
+                numBorders++;
-        if (gPageManager->getSystemDraw()->getBorder(borderName2, TSystemDraw::LT_ON, &bda))
+            if (gPageManager->getSystemDraw()->getBorder(sr[instance].bs, TSystemDraw::LT_ON, &bda))
-            numBorders++;
+                numBorders++;
+            if (numBorders == 2)
+                extBorder = true;
+        }
+        else if (!sr[instance].bs.empty())
+        {
+            if (gPageManager->getSystemDraw()->getBorder(bs, (instance == 0 ? TSystemDraw::LT_OFF : TSystemDraw::LT_ON), &bd, sr[instance].bs))
+            {
+                numBorders++;
+                extBorder = true;
+            }
+        }
-        if (numBorders == 2)
+        if (extBorder)
+        {
             MSG_DEBUG("System border \"" << borderName1 << "\" and \"" << borderName2 << "\" found.");
             SkColor color = TColor::getSkiaColor(sr[instance].cb);      // border color
             SkColor bgColor = TColor::getSkiaColor(sr[instance].cf);    // fill color
             MSG_DEBUG("Button color: #" << std::setw(6) << std::setfill('0') << std::hex << color);
             if (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);
             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());
             stretchImageHeight(&imgR, ht - imgTR.info().height() - imgBR.info().height());
+            MSG_DEBUG("Stretched button image size: " << (imgTL.info().width() + imgT.info().width() + imgTR.info().width()) << " x " << (imgTL.info().height() + imgL.info().height() + imgBL.info().height()));
             // Draw the frame
             SkCanvas canvas(*bm, SkSurfaceProps(1, kUnknown_SkPixelGeometry));
             SkPaint paint;
-            paint.setColor(bgColor);
             paint.setBlendMode(SkBlendMode::kSrcOver);
             canvas.drawBitmap(imgB, imgBL.info().width(), ht - imgB.info().height(), &paint);
             canvas.drawBitmap(imgBR, wt - imgBR.info().width(), ht - imgBR.info().height(), &paint);
             canvas.drawBitmap(imgR, wt - imgR.info().width(), imgTR.info().height(), &paint);
             canvas.drawBitmap(imgTR, wt - imgTR.info().width(), 0, &paint);
     int width = base.info().width();
     int height = base.info().height();
     if (width <= 0 || height <= 0)
+    {
-        MSG_WARNING("Got invalid width or height! (width: " << width << ", height: " << height);
+        MSG_WARNING("Got invalid width or height! (width: " << width << ", height: " << height << ")");
         return SkBitmap();
+    }
-    if (width != alpha.info().width() || height != alpha.info().height())
+    if (!alpha.empty())
+    {
+        if (width != alpha.info().width() || height != alpha.info().height())
+        {
-        MSG_ERROR("Base and alpha masks have different size!")
+            MSG_ERROR("Base and alpha masks have different size!");
-        return SkBitmap();
+            return SkBitmap();
+        }
+    }
     SkBitmap maskBm;
     maskBm.allocPixels(SkImageInfo::MakeN32Premul(width, height));
     maskBm.eraseColor(SK_ColorTRANSPARENT);
     for (int ix = 0; ix < width; ix++)
+    {
         for (int iy = 0; iy < height; iy++)
+        {
+            SkColor pixelAlpha = 0;
+            if (!alpha.empty())
-            SkColor pixelAlpha = alpha.getColor(ix, iy);
+                pixelAlpha = alpha.getColor(ix, iy);
+            else
+                pixelAlpha = base.getColor(ix, iy);
             uint32_t *wpix = maskBm.getAddr32(ix, iy);
             if (!wpix)
+            {
                 MSG_ERROR("No pixel buffer!");
                 break;
+            }
-            uint32_t alpha = SkColorGetA(pixelAlpha);
+            uint32_t ala = SkColorGetA(pixelAlpha);
-            if (alpha == 0 && !useBG)
+            if (ala == 0 && !useBG)
                 pixelAlpha = col;
-            else if (alpha == 0)
+            else if (ala == 0)
                 pixelAlpha = bg;
             else
+            {
                 // We've to change the red and the blue color channel because
                 // of an error in the Skia library.
                 uint32_t blue = SkColorGetR(col);
                 uint32_t green = SkColorGetG(col);
                 uint32_t red = SkColorGetB(col);
+                if (alpha.empty())
+                {
+                    uint32_t pred = SkColorGetR(pixelAlpha);
+                    uint32_t pgreen = SkColorGetG(pixelAlpha);
+                    uint32_t pblue = SkColorGetB(pixelAlpha);
+                    uint32_t maxChan = SkColorGetG(SK_ColorWHITE);
+                    red   = ((pred == maxChan) ? pred : red);
+                    green = ((pgreen == maxChan) ? pgreen : green);
+                    blue  = ((pblue == maxChan) ? pblue : blue);
+                }
-                if (alpha == 0)
+                else if (ala == 0)
                     red = green = blue = 0;
-                pixelAlpha = SkColorSetARGB(alpha, red, green, blue);
+                pixelAlpha = SkColorSetARGB(ala, red, green, blue);
+            }
             *wpix = pixelAlpha;
+//            MSG_DEBUG("Pixel " << ix << ", " << iy << ": #" << std::setw(8) << std::setfill('0') << std::hex << pixelAlpha);
+        }
+    }
+    if (!alpha.empty())
+    {
-    SkPaint paint;
+        SkPaint paint;
-    paint.setBlendMode(SkBlendMode::kSrcOver);
+        paint.setBlendMode(SkBlendMode::kSrcOver);
-    SkCanvas can(maskBm);
+        SkCanvas can(maskBm);
-    can.drawBitmap(base, 0, 0, &paint);
+        can.drawBitmap(base, 0, 0, &paint);
+    }
     return maskBm;
+}
 SkBitmap TButton::retrieveBorderImage(const string& pa, const string& pb, SkColor color, SkColor bgColor)
+{

Subversion Repositories tpanel

(root)/trunk/tbutton.cpp @ 169 – Rev 168 → 169