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

+{
     DECL_TRACER("TPage::show()");
     if (!_setBackground)
+    {
+        if (gPageManager && gPageManager->getCallbackBG())
+            _setBackground = gPageManager->getCallbackBG();
+        else
+        {
-        MSG_WARNING("No callback \"setBackground\" was set!");
+            MSG_WARNING("No callback \"setBackground\" was set!");
-        return;
+            return;
+        }
+    }
     ulong handle = (pageID << 16) & 0xffff0000;
     MSG_DEBUG("Processing page " << pageID);
             DecodeDataToBitmap(rawImage, &bm);
             SkImageInfo info = bm.info();
             size_t rowBytes = info.minRowBytes();
             size_t size = info.computeByteSize(rowBytes);
             calcPosition(info.width(), info.height(), &l, &t);
+            MSG_DEBUG("Background image size: l=" << l << ", t=" << t << ", w=" << info.width() << ", h=" << info.height());
             sk_sp<SkImage> im = SkImage::MakeFromBitmap(bm);
             bm.allocN32Pixels(width, height);
             bm.eraseColor(TColor::getSkiaColor(sr[0].cf));
             SkCanvas can(bm, SkSurfaceProps(1, kUnknown_SkPixelGeometry));
-            SkRect rect = SkRect::MakeXYWH(l, l, info.width(), info.height());
+            SkRect rect = SkRect::MakeXYWH(l, t, info.width(), info.height());
             SkPaint paint;
             paint.setBlendMode(SkBlendMode::kSrc);
             can.drawImageRect(im, rect, &paint);
             rowBytes = bm.info().minRowBytes();
             size = bm.info().computeByteSize(rowBytes);
             if (gPageManager && gPageManager->getScaleFactor() != 1.0)
+            {
                 paint.setFilterQuality(kHigh_SkFilterQuality);
                 // Calculate new dimension
-                int lwidth = (int)((double)info.width() * gPageManager->getScaleFactor());
+                double scaleFactor = gPageManager->getScaleFactor();
-                int lheight = (int)((double)info.height() * gPageManager->getScaleFactor());
+                MSG_DEBUG("Using scale factor " << scaleFactor);
-                int twidth = (int)((double)width * gPageManager->getScaleFactor());
+                int lwidth = (int)((double)info.width() * scaleFactor);
-                int theight = (int)((double)height * gPageManager->getScaleFactor());
+                int lheight = (int)((double)info.height() * scaleFactor);
-                int lleft = (int)(((double)(twidth - lwidth) / 2.0) * gPageManager->getScaleFactor());
+                int twidth = (int)((double)width * scaleFactor);
-                int ltop = (int)(((double)(theight - lheight) / 2.0) * gPageManager->getScaleFactor());
+                int theight = (int)((double)height * scaleFactor);
-                calcPosition(lwidth, lheight, &lleft, &ltop);
+                calcPosition(lwidth, lheight, &l, &t, true);
+                MSG_DEBUG("Scaled background image: l=" << l << ", t=" << t << ", w=" << lwidth << ", h=" << lheight << ", total w=" << twidth << ", total h=" << theight);
                 // Create a canvas and draw new image
                 sk_sp<SkImage> im = SkImage::MakeFromBitmap(bm);
                 bm.allocN32Pixels(twidth, theight);
                 bm.eraseColor(TColor::getSkiaColor(sr[0].cf));
-                SkCanvas can(bm, SkSurfaceProps(1, kUnknown_SkPixelGeometry));
+                SkCanvas can1(bm, SkSurfaceProps(1, kUnknown_SkPixelGeometry));
-                SkRect rect = SkRect::MakeXYWH(lleft, ltop, lwidth, lheight);
+                SkRect rect = SkRect::MakeXYWH(l, t, lwidth, lheight);
-                can.drawImageRect(im, rect, &paint);
+                can1.drawImageRect(im, rect, &paint);
                 rowBytes = bm.info().minRowBytes();
                 size = bm.info().computeByteSize(rowBytes);
+            }
             _setBackground(handle, (unsigned char *)bm.getPixels(), size, rowBytes, TColor::getColor(sr[0].cf));
     mZOrder = ZORDER_INVALID;
     mVisible = false;
+}
-void TPage::calcPosition(int im_width, int im_height, int *left, int *top)
+void TPage::calcPosition(int im_width, int im_height, int *left, int *top, bool scale)
+{
     DECL_TRACER("TPage::calcPosition(int im_width, int im_height, int *left, int *top)");
     int nw = width;
     int nh = height;
-    if (gPageManager && gPageManager->getScaleFactor() != 1.0)
+    if (scale && gPageManager && gPageManager->getScaleFactor() != 1.0)
+    {
         nw = (int)((double)width * gPageManager->getScaleFactor());
         nh = (int)((double)height * gPageManager->getScaleFactor());
+    }
+    {
         case 0: // absolute position
             *left = sr[0].bx;
             *top = sr[0].by;
-            if (gPageManager && gPageManager->getScaleFactor() != 1.0)
+            if (scale && gPageManager && gPageManager->getScaleFactor() != 1.0)
+            {
                 *left = (int)((double)sr[0].bx * gPageManager->getScaleFactor());
                 *left = (int)((double)sr[0].by * gPageManager->getScaleFactor());
+            }
         break;
         case 4: // left, middle
             *left = 0;
             *top = (nh - im_height) / 2;
         break;
-        case 5: // center, middle
-            *left = (nw - im_width) / 2;
-            *top = (nh - im_height) / 2;
-        break;
         case 6: // right, middle
             *left = nw - im_width;
             *top = (nh - im_height) / 2;
         break;
         case 9: // right, bottom
             *left = nw - im_width;
             *top = nh - im_height;
         break;
+        default:    // center middle
+            *left = (nw - im_width) / 2;
+            *top = (nh - im_height) / 2;
+    }
     if (*left < 0)
         *left = 0;

Subversion Repositories tpanel

(root)/trunk/tpage.cpp @ 31 – Rev 28 → 31