Add keyboard shortcuts for Estimate/Score

Close #345
SabakiHQ · Feb 28, 2020 · e2dce4c · e2dce4c
1 parent eea323f
commit e2dce4c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/src/components/App.js b/src/components/App.js
@@ -3,7 +3,6 @@ import {h, render, Component} from 'preact'
 import classNames from 'classnames'
 import fixPath from 'fix-path'
 
-import deadstones from '@sabaki/deadstones'
 import influence from '@sabaki/influence'
 
 import TripleSplitContainer from './helpers/TripleSplitContainer.js'
@@ -28,7 +27,6 @@ const setting = remote.require('./setting')
 const leftSidebarMinWidth = setting.get('view.sidebar_minwidth')
 const sidebarMinWidth = setting.get('view.leftsidebar_minwidth')
 
-deadstones.useFetch('./node_modules/@sabaki/deadstones/wasm/deadstones_bg.wasm')
 fixPath()
 
 class App extends Component {
@@ -311,7 +309,7 @@ class App extends Component {
 
       areaMap =
         state.mode === 'estimator'
-          ? influence.map(scoreBoard.signMap)
+          ? influence.map(scoreBoard.signMap, {discrete: true})
           : influence.areaMap(scoreBoard.signMap)
     }
 

diff --git a/src/components/MainView.js b/src/components/MainView.js
@@ -112,9 +112,7 @@ export default class MainView extends Component {
     let paintMap
 
     if (['scoring', 'estimator'].includes(mode)) {
-      paintMap = areaMap.map(row =>
-        row.map(x => ((Math.abs(x) * 2 + 1) / 3) * Math.sign(x))
-      )
+      paintMap = areaMap
     } else if (mode === 'guess') {
       paintMap = [...Array(board.height)].map(_ => Array(board.width).fill(0))
 

diff --git a/src/menu.js b/src/menu.js
@@ -118,7 +118,7 @@ exports.get = function(props = {}) {
         },
         {type: 'separator'},
         {
-          label: i18n.t('menu.play', '&Select Point'),
+          label: i18n.t('menu.play', 'Se&lect Point'),
           accelerator: 'CmdOrCtrl+L',
           click: async () => {
             let value = await dialog.showInputBox(
@@ -135,17 +135,23 @@ exports.get = function(props = {}) {
           click: () => sabaki.makeMove([-1, -1])
         },
         {
-          label: i18n.t('menu.play', '&Resign'),
+          label: i18n.t('menu.play', 'Resig&n'),
           click: () => sabaki.makeResign()
         },
         {type: 'separator'},
         {
           label: i18n.t('menu.play', '&Estimate'),
-          click: () => sabaki.setMode('estimator')
+          accelerator: 'CmdOrCtrl+Shift+E',
+          click: () =>
+            sabaki.setMode(
+              sabaki.state.mode === 'estimator' ? 'play' : 'estimator'
+            )
         },
         {
-          label: i18n.t('menu.play', 'Sc&ore'),
-          click: () => sabaki.setMode('scoring')
+          label: i18n.t('menu.play', 'Sco&re'),
+          accelerator: 'CmdOrCtrl+Shift+R',
+          click: () =>
+            sabaki.setMode(sabaki.state.mode === 'scoring' ? 'play' : 'scoring')
         }
       ]
     },

diff --git a/src/modules/sabaki.js b/src/modules/sabaki.js
@@ -19,6 +19,8 @@ import * as gtplogger from './gtplogger.js'
 import * as helper from './helper.js'
 import * as sound from './sound.js'
 
+deadstones.useFetch('./node_modules/@sabaki/deadstones/wasm/deadstones_bg.wasm')
+
 const {app} = remote
 const setting = remote.require('./setting')
 
@@ -212,6 +214,8 @@ class Sabaki extends EventEmitter {
   // User Interface
 
   setMode(mode) {
+    if (this.state.mode === mode) return
+
     let stateChange = {mode}
 
     if (['scoring', 'estimator'].includes(mode)) {