Revert "Flipped texture coordinates right way up."

This reverts commit ffb6fe57ee0ece18b6778889f7602811ab4ca822.

Conflicts:

	src/declarative/scenegraph/qsgdefaultimagenode.cpp

1 files changed, 8 insertions, 6 deletions

diff --git a/src/declarative/items/qsgninepatchnode.cpp b/src/declarative/items/qsgninepatchnode.cpp
index 7858e98190..045dd6c94f 100644
--- a/src/declarative/items/qsgninepatchnode.cpp
+++ b/src/declarative/items/qsgninepatchnode.cpp
@@ -147,7 +147,8 @@ void QSGNinePatchNode::update()
         xChunkSize = xTexSize;
     } else if (m_horizontalTileMode == QSGBorderImage::Round) {
         xChunkCount = qCeil(xSize / xTexSize);
-        xChunkSize = xSize / xChunkCount;
+        qreal fullWidth = xChunkCount * xTexSize;
+        xChunkSize = xTexSize * xSize / fullWidth;
     } else {
         xChunkCount = 1;
         xChunkSize = xSize;
@@ -163,7 +164,8 @@ void QSGNinePatchNode::update()
         yChunkSize = yTexSize;
     } else if (m_verticalTileMode == QSGBorderImage::Round) {
         yChunkCount = qCeil(ySize / yTexSize);
-        yChunkSize = ySize / yChunkCount;
+        qreal fullHeight = yChunkCount * yTexSize;
+        yChunkSize = yTexSize * ySize / fullHeight;
     } else {
         yChunkCount = 1;
         yChunkSize = ySize;
@@ -184,10 +186,10 @@ void QSGNinePatchNode::update()
 
     // Fill in the vertices.. The loop below is pretty much an exact replica
     // of the one inside fillRow.
-    float yTexChunk1 = 1 - m_innerRect.top() / th;
-    float yTexChunk2 = 1 - m_innerRect.bottom() / th;
+    float yTexChunk1 = m_innerRect.top() / th;
+    float yTexChunk2 = m_innerRect.bottom() / th;
 
-    fillRow(v, 0, 1, xChunkCount, xChunkSize);
+    fillRow(v, 0, 0, xChunkCount, xChunkSize);
     fillRow(v, m_innerRect.y(), yTexChunk1, xChunkCount, xChunkSize);
 
     for (int yc=0; yc<yChunkCount; ++yc) {
@@ -206,7 +208,7 @@ void QSGNinePatchNode::update()
     }
 
     fillRow(v, m_targetRect.height() - bottomBorder, yTexChunk2, xChunkCount, xChunkSize);
-    fillRow(v, m_targetRect.height(), 0, xChunkCount, xChunkSize);
+    fillRow(v, m_targetRect.height(), 1, xChunkCount, xChunkSize);
 
 
 //    v = m_geometry.vertexDataAsTexturedPoint2D();