X-Git-Url: https://git.auder.net/images/pieces/Cwda/bt.svg?a=blobdiff_plain;f=client%2Fsrc%2Fcomponents%2FBoard.vue;h=ddc137317ed208a9dca4a78b0d982a5245997360;hb=12c5cf05bae003214434079a2f9e1c011fdb2fa7;hp=7257b2180bd171006ceed2423d1475b4acf85954;hpb=7e355d68b5962aad106e28a9d669a47f3cbec43a;p=vchess.git

diff --git a/client/src/components/Board.vue b/client/src/components/Board.vue
index 7257b218..ddc13731 100644
--- a/client/src/components/Board.vue
+++ b/client/src/components/Board.vue
@@ -1,29 +1,33 @@
 <script>
-// TODO: BoardHex for hexagonal variants (2 players)
-
 import { getSquareId, getSquareFromId } from "@/utils/squareId";
 import { ArrayFun } from "@/utils/array";
-
+import { store } from "@/store";
 export default {
   name: 'my-board',
   // Last move cannot be guessed from here, and is required to highlight squares
   // vr: object to check moves, print board...
   // userColor is left undefined for an external observer
-  props: ["vr","lastMove","analyze","orientation","userColor","vname"],
+  props: ["vr","lastMove","analyze","incheck","orientation","userColor","vname"],
   data: function () {
     return {
-      hints: (!localStorage["hints"] ? true : localStorage["hints"] === "1"),
-      bcolor: localStorage["bcolor"] || "lichess", //lichess, chesscom or chesstempo
       possibleMoves: [], //filled after each valid click/dragstart
       choices: [], //promotion pieces, or checkered captures... (as moves)
       selectedPiece: null, //moving piece (or clicked piece)
-      incheck: [],
       start: {}, //pixels coordinates + id of starting square (click or drag)
+      settings: store.state.settings,
     };
   },
   render(h) {
     if (!this.vr)
-      return;
+    {
+      // Return empty div of class 'game' to avoid error when setting size
+      return h("div",
+        {
+          "class": {
+            "game": true,
+          },
+        });
+    }
     const [sizeX,sizeY] = [V.size.x,V.size.y];
     // Precompute hints squares to facilitate rendering
     let hintSquares = ArrayFun.init(sizeX, sizeY, false);
@@ -31,7 +35,14 @@ export default {
     // Also precompute in-check squares
     let incheckSq = ArrayFun.init(sizeX, sizeY, false);
     this.incheck.forEach(sq => { incheckSq[sq[0]][sq[1]] = true; });
-    const squareWidth = 40; //TODO: compute this
+
+    let boardElt = document.querySelector(".game");
+    const squareWidth = (!!boardElt
+      ? boardElt.offsetWidth / sizeY
+      : 40); //arbitrary value (not relevant)
+    const offset = (!!boardElt
+      ? [boardElt.offsetTop, boardElt.offsetLeft]
+      : [0, 0]);
     const choices = h(
       'div',
       {
@@ -39,7 +50,8 @@ export default {
         'class': { 'row': true },
         style: {
           "display": (this.choices.length > 0 ? "block" : "none"),
-          "top": "-" + ((sizeY/2)*squareWidth+squareWidth/2) + "px",
+          "top": (offset[0] + (sizeY/2)*squareWidth-squareWidth/2) + "px",
+          "left": (offset[1] + squareWidth*(sizeY - this.choices.length)/2) + "px",
           "width": (this.choices.length * squareWidth) + "px",
           "height": squareWidth + "px",
         },
@@ -73,7 +85,7 @@ export default {
     );
     // Create board element (+ reserves if needed by variant or mode)
     const lm = this.lastMove;
-    const showLight = this.hints && this.vname != "Dark";
+    const showLight = this.settings.highlight && this.vname != "Dark";
     const gameDiv = h(
       'div',
       {
@@ -116,7 +128,7 @@ export default {
                 )
               );
             }
-            if (this.hints && hintSquares[ci][cj])
+            if (this.settings.hints && hintSquares[ci][cj])
             {
               elems.push(
                 h(
@@ -140,7 +152,7 @@ export default {
                   ['board'+sizeY]: true,
                   'light-square': (i+j)%2==0,
                   'dark-square': (i+j)%2==1,
-                  [this.bcolor]: true,
+                  [this.settings.bcolor]: true,
                   'in-shadow': this.vname=="Dark" && !this.analyze
                     && (!this.userColor
                       || !this.vr.enlightened[this.userColor][ci][cj]),
@@ -353,7 +365,7 @@ export default {
 };
 </script>
 
-<style lang="sass">
+<style lang="sass" scoped>
 .game.reserve-div
   margin-bottom: 18px
 
@@ -384,17 +396,14 @@ div.board11
   padding-bottom: 9.1%
 
 .game
-  width: 80vh
-  margin: 0 auto
+  width: 100%
+  margin: 0
   .board
     cursor: pointer
-  @media screen and (max-width: 767px)
-    width: 100%
-    margin: 0
 
 #choices
-  margin: 0 auto 0 auto
-  position: relative
+  margin: 0
+  position: absolute
   z-index: 300
   overflow-y: inherit
   background-color: rgba(0,0,0,0)