Fix #26 Bad total size calculation

mistic100 · Feb 9, 2018 · bdc2e99 · bdc2e99
1 parent 570992d
commit bdc2e99
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/environment.cpp b/src/environment.cpp
@@ -125,8 +125,8 @@ void Environment::refreshMonitors()
 
         minX = qMin(minX, wpSize.left());
         minY = qMin(minY, wpSize.top());
-        maxX = qMax(maxX, wpSize.right());
-        maxY = qMax(maxY, wpSize.bottom());
+        maxX = qMax(maxX, wpSize.left() + wpSize.width());
+        maxY = qMax(maxY, wpSize.top() + wpSize.height());
     }
 
     // store whole desktop size with its top-left-most position

diff --git a/src/gui/customlayoutdialog.cpp b/src/gui/customlayoutdialog.cpp
@@ -257,9 +257,9 @@ void CustomLayoutDialog::renderPreview()
     {
         QRect newBlock = UM::scaledRect(block, wRatio, hRatio);
 
-        if (qAbs(newBlock.left() - size.width()) <= 3)
+        if (qAbs(newBlock.right() - size.width()) <= 3)
         {
-            newBlock.setLeft(size.width()-1);
+            newBlock.setRight(size.width()-1);
         }
 
         if (qAbs(newBlock.bottom() - size.height()) <= 3)

diff --git a/src/wallpapergenerator.cpp b/src/wallpapergenerator.cpp
@@ -451,9 +451,9 @@ QString WallpaperGenerator::generateCustomFile(int _idx, WallpaperGenerator::Res
         QRect newBlock = UM::scaledRect(block, wRatio, hRatio);
 
         // make sure the rect touch the border of the screen
-        if (qAbs(newBlock.left() - scrRect.width()) <= 3)
+        if (qAbs(newBlock.right() - scrRect.width()) <= 3)
         {
-            newBlock.setLeft(scrRect.width()-1);
+            newBlock.setRight(scrRect.width()-1);
         }
 
         if (qAbs(newBlock.bottom() - scrRect.height()) <= 3)
@@ -902,8 +902,8 @@ QRect WallpaperGenerator::getDesktopEnabledRect()
 
         minX = qMin(minX, rect.left());
         minY = qMin(minY, rect.top());
-        maxX = qMax(maxX, rect.left()+rect.width());
-        maxY = qMax(maxY, rect.top()+rect.height());
+        maxX = qMax(maxX, rect.left() + rect.width());
+        maxY = qMax(maxY, rect.top() + rect.height());
     }
 
     return QRect(minX, minY, maxX-minX, maxY-minY);