Ticket #4720: wallpaper-fix.2.diff

src/preferences/backgrounds/BackgroundImage.cpp

@@ -299 +299 @@
             // else fall thru
         case kScaledToFit:
             if (fIsDesktop) {
-                destinationBitmapBounds = viewBounds;
+                if (BRectRatio(destinationBitmapBounds)
+                    >= BRectRatio(viewBounds)) {
+                    float overlap = BRectHorizontalOverlap(viewBounds,
+                        destinationBitmapBounds);
+                    destinationBitmapBounds.Set(-overlap, 0,
+                        viewBounds.Width() + overlap, viewBounds.Height());
+                } else {
+                    float overlap = BRectVerticalOverlap(viewBounds,
+                        destinationBitmapBounds);
+                    destinationBitmapBounds.Set(0, -overlap,
+                        viewBounds.Width(), viewBounds.Height() + overlap);
+                }
                 followFlags = B_FOLLOW_ALL;
                 break;
             }
@@ -334 +345 @@
 }
 
 
+float
+BackgroundImage::BRectRatio(BRect rect)
+{
+    return rect.Width() / rect.Height();
+}
+
+
+float
+BackgroundImage::BRectHorizontalOverlap(BRect hostRect, BRect resizedRect)
+{
+    return (((hostRect.Height() / resizedRect.Height())
+        * resizedRect.Width()) - hostRect.Height()) / 2;
+}
+
+
+float
+BackgroundImage::BRectVerticalOverlap(BRect hostRect, BRect resizedRect)
+{
+    return (((hostRect.Width() / resizedRect.Width())
+        * resizedRect.Height()) - hostRect.Width()) / 2;
+}
+
+
 void
 BackgroundImage::Remove()
 {

src/preferences/backgrounds/BackgroundImage.h

@@ -139 +139 @@
         // no public constructor, GetBackgroundImage factory function is
         // used instead
 
+    float BRectRatio(BRect rect);
+    float BRectHorizontalOverlap(BRect hostRect, BRect resizedRect);
+    float BRectVerticalOverlap(BRect hostRect, BRect resizedRect);
+
     bool fIsDesktop;
     BNode fDefinedByNode;
     BView* fView;

src/kits/tracker/BackgroundImage.cpp

@@ -199 +199 @@
             // else fall thru
         case kScaledToFit:
             if (fIsDesktop) {
-                destinationBitmapBounds = viewBounds;
+                if (BRectRatio(destinationBitmapBounds)
+                    >= BRectRatio(viewBounds)) {
+                    float overlap = BRectHorizontalOverlap(viewBounds,
+                        destinationBitmapBounds);
+                    destinationBitmapBounds.Set(-overlap, 0,
+                        viewBounds.Width() + overlap, viewBounds.Height());
+                } else {
+                    float overlap = BRectVerticalOverlap(viewBounds,
+                        destinationBitmapBounds);
+                    destinationBitmapBounds.Set(0, -overlap,
+                        viewBounds.Width(), viewBounds.Height() + overlap);
+                }
                 followFlags = B_FOLLOW_ALL;
                 break;
             }
@@ -224 +235 @@
     fShowingBitmap = info;
 }
 
+
+float
+BackgroundImage::BRectRatio(BRect rect)
+{
+    return rect.Width() / rect.Height();
+}
+
+
+float
+BackgroundImage::BRectHorizontalOverlap(BRect hostRect, BRect resizedRect)
+{
+    return (((hostRect.Height() / resizedRect.Height())
+        * resizedRect.Width()) - hostRect.Height()) / 2;
+}
+
+
+float
+BackgroundImage::BRectVerticalOverlap(BRect hostRect, BRect resizedRect)
+{
+    return (((hostRect.Width() / resizedRect.Width())
+        * resizedRect.Height()) - hostRect.Width()) / 2;
+}
+
+
 void 
 BackgroundImage::Remove()
 {

src/kits/tracker/BackgroundImage.h

@@ -115 +115 @@
 
     void Add(BackgroundImageInfo *);
 
+    float BRectRatio(BRect rect);
+    float BRectHorizontalOverlap(BRect hostRect, BRect resizedRect);
+    float BRectVerticalOverlap(BRect hostRect, BRect resizedRect);
+
     bool fIsDesktop;
     BNode fDefinedByNode;
     BView *fView;