process oversized items first

pureqml · Nov 24, 2019 · ed5509d · ed5509d
1 parent a95c9bb
commit ed5509d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/core/BaseView.qml b/core/BaseView.qml
@@ -304,10 +304,10 @@ BaseLayout {
 		var w = this.width, h = this.height
 
 		var atCenter = x - w / 2 + iw / 2
-		if (center && this.contentWidth > w)
-			this.contentX = atCenter < 0 ? 0 : x > this.contentWidth - w / 2 - iw / 2 ? this.contentWidth - w : atCenter
-		else if (iw > w)
+		if (iw > w)
 			this.contentX = centerOversized? atCenter: x
+		else if (center && this.contentWidth > w)
+			this.contentX = atCenter < 0 ? 0 : x > this.contentWidth - w / 2 - iw / 2 ? this.contentWidth - w : atCenter
 		else if (x - cx <= 0)
 			this.contentX = x
 		else if (x - cx + iw > w)
@@ -321,10 +321,10 @@ BaseLayout {
 		var w = this.width, h = this.height
 
 		var atCenter = y - h / 2 + ih / 2
-		if (center && this.contentHeight > h)
-			this.contentY = atCenter < 0 ? 0 : y > this.contentHeight - h / 2 - ih / 2 ? this.contentHeight - h : atCenter
-		else if (ih > h)
+		if (ih > h)
 			this.contentY = centerOversized? atCenter: y
+		else if (center && this.contentHeight > h)
+			this.contentY = atCenter < 0 ? 0 : y > this.contentHeight - h / 2 - ih / 2 ? this.contentHeight - h : atCenter
 		else if (y - cy <= 0)
 			this.contentY = y
 		else if (y - cy + ih > h)