From d842bfde4919d15ff1196917557a640bb66d6e67 Mon Sep 17 00:00:00 2001
From: Minizbot2012 <bradleyfwin@gmail.com>
Date: Wed, 3 Jun 2020 11:17:34 -0400
Subject: [PATCH] Further fixes to CKI, reduce number of casts

---
 keymap/orbweaver/orbweaver.go | 4 ++--
 keys/cki.go                   | 2 +-
 ui/bind/popup.go              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keymap/orbweaver/orbweaver.go b/keymap/orbweaver/orbweaver.go
index 560556b..f3570d3 100644
--- a/keymap/orbweaver/orbweaver.go
+++ b/keymap/orbweaver/orbweaver.go
@@ -19,9 +19,9 @@ func SaveIntoKeymap(mapped *PKM, file fyne.FileWriteCloser) {
 	buf := make([]byte, 2)
 	for i := 0; i < 26; i++ {
 		if i < 20 {
-			binary.LittleEndian.PutUint16(buf, uint16(keys.GetSCForASCII(int(byte(mapped.MIP[i])))))
+			binary.LittleEndian.PutUint16(buf, uint16(keys.GetSCForASCII(int(mapped.MIP[i]))))
 		} else {
-			binary.LittleEndian.PutUint16(buf, uint16(keys.GetSCForASCII(int(byte(mapped.SIP[i-20])))))
+			binary.LittleEndian.PutUint16(buf, uint16(keys.GetSCForASCII(int(mapped.SIP[i-20]))))
 		}
 		file.Write(buf)
 	}
diff --git a/keys/cki.go b/keys/cki.go
index eb0caa6..5cdea1c 100644
--- a/keys/cki.go
+++ b/keys/cki.go
@@ -74,7 +74,7 @@ func CKIFyneKeyMap(e fyne.KeyName) int {
 	case desktop.KeyShiftRight:
 		return CommonToASCII["KEY_RIGHTSHIFT"]
 	default:
-		return int(e[0])
+		return CommonToASCII["KEY_"+string(e)]
 	}
 }
 
diff --git a/ui/bind/popup.go b/ui/bind/popup.go
index bffcb4c..1813c31 100644
--- a/ui/bind/popup.go
+++ b/ui/bind/popup.go
@@ -61,7 +61,7 @@ func (bp *Page) createGrid() *fyne.Container {
 //Create the binding page popup
 func (bp *Page) Create(bid string) fyne.CanvasObject {
 	bp.dev = make(map[string]fyne.CanvasObject)
-	bp.dev["BL"] = widget.NewLabel(keys.CKIName(bp.Bind.Bound))
+	bp.dev["BL"] = widget.NewLabel(keys.ASCIIToCommon(bp.Bind.Bound))
 	pop := widget.NewVBox(bp.dev["BL"], bp.createGrid())
 	bp.window.Canvas().SetOnTypedKey(bp.TypeKey)
 	return pop