From e90b7c4e087439b7e358916be8fb8cd6a2aaba0a Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Sun, 31 Jul 2016 07:25:31 +0000
Subject: [PATCH] nanovg API changes fix

FossilOrigin-Name: 57073305a9ce210201c9f237879d7aec3db224b3b5997c3526fb34356761c441
---
 ewbillboard.d | 22 +++++++++++-----------
 xlayouter.d   |  2 +-
 xreader.d     |  6 +++---
 xreaderui.d   |  4 ++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ewbillboard.d b/ewbillboard.d
index 7797714..3e475c6 100644
--- a/ewbillboard.d
+++ b/ewbillboard.d
@@ -52,9 +52,9 @@ public:
     vg = avg;
     scope(exit) vg = null;
     vg.fontFaceId(galmapFont);
-    vg.textAlign(NVGAlign.Left|NVGAlign.Baseline);
+    vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Baseline);
     vg.fontSize(fGalMapSize);
-    vg.textAlign(NVGAlign.Left|NVGAlign.Top);
+    vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Top);
     buildPlanetData(p);
   }
 
@@ -74,7 +74,7 @@ public:
 
     version(none) {
       vg.fontFaceId(uiFont);
-      vg.textAlign(NVGAlign.Left|NVGAlign.Top);
+      vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Top);
       vg.fontSize(16);
       float[4] b = void;
       float adv;
@@ -84,7 +84,7 @@ public:
 
     bndSetFont(galmapFont);
     vg.fontFaceId(galmapFont);
-    vg.textAlign(NVGAlign.Left|NVGAlign.Baseline);
+    vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Baseline);
     vg.fontSize(fGalMapSize);
 
     vg.bndMenuBackground(mx, my, billW+8, billH+8, BND_CORNER_NONE);
@@ -94,18 +94,18 @@ public:
     foreach (immutable idx; 0..lines.length) {
       float x = mx+4;
       vg.fillColor(nvgRGBA(255, 255, 255));
-      vg.textAlign(NVGAlign.Right|NVGAlign.Top);
+      vg.textAlign(NVGTextAlign.H.Right, NVGTextAlign.V.Top);
       x += ltblW[0];
       vg.text(x, y, lines[idx][0]);
       x += 4;
       vg.fillColor(nvgRGBA(255, 255, 0));
-      vg.textAlign(NVGAlign.Left|NVGAlign.Top);
+      vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Top);
       vg.text(x, y, lines[idx][1]);
       y += lineH[idx];
     }
     // planet descrition
     vg.fillColor(nvgRGBA(255, 127, 0));
-    vg.textAlign(NVGAlign.Left|NVGAlign.Top);
+    vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Top);
     y += 8;
     vg.text(mx+4, y, pdsc);
     y += pdscH+4;
@@ -113,14 +113,14 @@ public:
     vg.fillColor(nvgRGBA(255, 255, 255));
     foreach (immutable idx; 0..market.length) {
       float x = mx+4;
-      vg.textAlign(NVGAlign.Left|NVGAlign.Top);
+      vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Top);
       vg.text(x, y, market[idx][0]);
       x += mtblW[0]+8+mtblW[1];
-      vg.textAlign(NVGAlign.Right|NVGAlign.Top);
+      vg.textAlign(NVGTextAlign.H.Right, NVGTextAlign.V.Top);
       vg.text(x, y, market[idx][1]);
       x += mtblW[2]+8;
       vg.text(x, y, market[idx][2]);
-      vg.textAlign(NVGAlign.Left|NVGAlign.Top);
+      vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Top);
       x += 1;
       vg.text(x, y, Galaxy.good(idx).unitName);
       y += mlineH[idx];
@@ -239,7 +239,7 @@ void drawGalaxy (NVGContext vg) {
   vg.resetScissor;
 
   vg.fontFaceId(uiFont);
-  vg.textAlign(NVGAlign.Left|NVGAlign.Baseline);
+  vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Baseline);
   vg.fontSize(fsizeUI);
 
   //vg.beginFrame(GWidth, GHeight, 1);
diff --git a/xlayouter.d b/xlayouter.d
index 68aa335..b6e4ca4 100644
--- a/xlayouter.d
+++ b/xlayouter.d
@@ -86,7 +86,7 @@ public:
     fs.fonsResetAtlas(1024, 1024);
     fonsSetSpacing(fs, 0);
     fonsSetBlur(fs, 0);
-    fonsSetAlign(fs, NVGAlign.Left|NVGAlign.Baseline);
+    fonsSetAlign(fs, NVGTextAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Baseline));
   }
 
   ~this () { freeFontStash(); }
diff --git a/xreader.d b/xreader.d
index c3d3c3a..58dbab6 100644
--- a/xreader.d
+++ b/xreader.d
@@ -460,7 +460,7 @@ void run (string bookFileName) {
   void drawShipName () {
     if (shipModel is null || shipModel.name.length == 0) return;
     vg.fontFaceId(uiFont);
-    vg.textAlign(NVGAlign.Left|NVGAlign.Baseline);
+    vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Baseline);
     vg.fontSize(fsizeUI);
     auto w = vg.bndLabelWidth(-1, shipModel.name)+8;
     float h = BND_WIDGET_HEIGHT+8;
@@ -726,7 +726,7 @@ void run (string bookFileName) {
         vg.intersectScissor((sbLeft ? 2+BND_SCROLLBAR_WIDTH+2 : 4), drawY, GWidth-4-2-BND_SCROLLBAR_WIDTH-2, textHeight);
         vg.fontFaceId(textFont);
         vg.fontSize(fsizeText);
-        vg.textAlign(NVGAlign.Center|NVGAlign.Middle);
+        vg.textAlign(NVGTextAlign.H.Center, NVGTextAlign.V.Middle);
         vg.text(GWidth/2, GHeight/2, "REFORMATTING");
         vg.fill();
       }
@@ -741,7 +741,7 @@ void run (string bookFileName) {
       int lidx = laytext.findLineAtY(topY);
       if (lidx >= 0 && lidx < laytext.lineCount) {
         drawY -= topY-laytext.line(lidx).y;
-        vg.textAlign(NVGAlign.Left|NVGAlign.Baseline);
+        vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Baseline);
         LayFontStyle lastStyle;
         int startx = startX;
         while (lidx < laytext.lineCount && drawY < GHeight) {
diff --git a/xreaderui.d b/xreaderui.d
index 98b7907..0a1eca6 100644
--- a/xreaderui.d
+++ b/xreaderui.d
@@ -171,7 +171,7 @@ final class PopupMenu {
     assert(avg !is null);
     vg = avg;
     vg.fontFaceId(uiFont);
-    vg.textAlign(NVGAlign.Left|NVGAlign.Baseline);
+    vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Baseline);
     vg.fontSize(fsizeUI);
     maxW = 0;
     if (atitle !is null) {
@@ -261,7 +261,7 @@ final class PopupMenu {
     scope(exit) vg.restore();
     if (moving) vg.globalAlpha(0.8);
     vg.fontFaceId(uiFont);
-    vg.textAlign(NVGAlign.Left|NVGAlign.Baseline);
+    vg.textAlign(NVGTextAlign.H.Left, NVGTextAlign.V.Baseline);
     vg.fontSize(fsizeUI);
     normPage();
     int ey = calcBotY;
-- 
2.11.4.GIT