Fix label alignments

- Left and right were logically swapped
- Horizontal axis labels on slice views were incorrectly aligned

Change-Id: I8c13acaeec02961464ee63f8b489e353dcb379e6
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 7 insertions, 18 deletions

diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index a5fd6601..a14678ce 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -300,27 +300,16 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte
 
     // Apply alignment
     QVector3D anchorPoint;
-    switch (alignment) {
-    case Qt::AlignLeft: {
-        anchorPoint.setX(float(-textureSize.width()) * scaleFactor);
-        break;
-    }
-    case Qt::AlignRight: {
+
+    if (alignment & Qt::AlignLeft)
         anchorPoint.setX(float(textureSize.width()) * scaleFactor);
-        break;
-    }
-    case Qt::AlignTop: {
+    else if (alignment & Qt::AlignRight)
+        anchorPoint.setX(float(-textureSize.width()) * scaleFactor);
+
+    if (alignment & Qt::AlignTop)
         anchorPoint.setY(float(-textureSize.height()) * scaleFactor);
-        break;
-    }
-    case Qt::AlignBottom: {
+    else if (alignment & Qt::AlignBottom)
         anchorPoint.setY(float(textureSize.height()) * scaleFactor);
-        break;
-    }
-    default: {
-        break;
-    }
-    }
 
     if (position < LabelBottom) {
         xPosition = item.translation().x();