From d4dee04c7fa01f30997ca02dcb063f89bcee3968 Mon Sep 17 00:00:00 2001
From: Ross <writetoross@gmail.com>
Date: Wed, 19 Oct 2022 15:22:03 +1000
Subject: [PATCH] feat(windows): remove hotkey from pop-up. content-frame size

The hotkey option and editing did not need to be on the add remove
languages pop-up.
There size of the contentframe for all the tabs was incorrectly
calculated. The header size was not correct as the header had
padding. This caused the size to be redrawn incorrectly when
a scroll bar was first added.
---
 windows/src/desktop/kmshell/xml/config.css              | 4 ++--
 windows/src/desktop/kmshell/xml/config.js               | 3 +--
 windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl | 6 ++++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/windows/src/desktop/kmshell/xml/config.css b/windows/src/desktop/kmshell/xml/config.css
index 281d6afe73..b842e8963f 100644
--- a/windows/src/desktop/kmshell/xml/config.css
+++ b/windows/src/desktop/kmshell/xml/config.css
@@ -708,7 +708,7 @@ table tr
 
 .options_list_header
 {
-  background: #e0e5ef;
+  background: #DADDDC;
   font-size: 13.3px;
   font-weight: bold;
   color: #001020;
@@ -751,7 +751,7 @@ table tr
 
 .hotkey_title
 {
-  background: #e0e5ef;
+  background: #DADDDC;
   font-size: 13.3px;
   font-weight: bold;
   color: #001020;
diff --git a/windows/src/desktop/kmshell/xml/config.js b/windows/src/desktop/kmshell/xml/config.js
index 57331aa149..d9661a6bb0 100644
--- a/windows/src/desktop/kmshell/xml/config.js
+++ b/windows/src/desktop/kmshell/xml/config.js
@@ -27,7 +27,7 @@ function windowResize()
     eContent.style.top = 0 + 'px';
     eMenu.style.height = (document.body.offsetHeight - eFooter.offsetHeight - eMenu.offsetTop) + 'px';
 
-    var h = (eContent.offsetHeight - 37 - 2) + 'px'; // header height and border height
+    var h = (eContent.offsetHeight - 40 - 2) + 'px'; // header height and border height
     _$('subcontent_keyboards').style.height = h;
     _$('subcontent_options').style.height = h;
     var e = _$('subcontent_hotkeys');
@@ -280,7 +280,6 @@ document.addEventListener("DOMContentLoaded", windowResize);
         state.modify_languages.push({name: name, modify: $(this).hasClass('modify-visible')});
       }
     });
-
     const stateJson = JSON.stringify(state);
     const params = new URLSearchParams(window.location.search);
     const PageTag = params.get('tag');
diff --git a/windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl b/windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl
index fafe4f3947..1ac342be2c 100644
--- a/windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl
+++ b/windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl
@@ -222,7 +222,7 @@
                       <xsl:attribute name='id'>qrcode-img-<xsl:value-of select="../../id" /></xsl:attribute>
                     </div>
                     <div class='qrcode-caption'>
-                      <xsl:value-of select="$locale/string[@name='S_Keyboard_Share_QRCode']"/>
+                      <xsl:value-of select="$locale/string[@name='S_Keyboard_Share_QRCode']"/>&#160;
                       <a>
                         <xsl:attribute name="href">keyman:link?url=<xsl:value-of select="/Keyman/keyman-com" />/go/keyboard/<xsl:value-of select="../../id" />/share</xsl:attribute>
                         <xsl:value-of select="$locale/string[@name='S_Keyboard_Share_Link']"/>
@@ -425,7 +425,8 @@
 
       <div class="language-icon"><xsl:value-of select="substring(bcp47code, 1, 2)" /></div>
       <div><xsl:value-of select="langname" /> (<xsl:value-of select="bcp47code" />)</div>
-      <xsl:if test="count(//KeymanLanguage[keymankeyboardid=$id]) > 1">
+      <!-- only provided the hotkeys in the detail drop down, not the modify dialog -->
+      <xsl:if test="count(//KeymanLanguage[keymankeyboardid=$id]) > 1 and $modify=0">
         <div class="hotkey" tabindex = "-1">
           <xsl:for-each select="//KeymanLanguage">
             <xsl:if test="keymankeyboardid=$id and bcp47code=$bcp47code and layoutname=$name">
@@ -445,6 +446,7 @@
       </xsl:if>
       <xsl:if test="$modify = 1">
         <div>
+         <xsl:attribute name="style">margin-left: auto; margin-right: 10px;</xsl:attribute>
           <a>
             <xsl:attribute name="href">keyman:keyboardlanguage_uninstall?id=<xsl:value-of select='../../id'/>&amp;bcp47code=<xsl:value-of select="bcp47code"/></xsl:attribute>
             <img src="/app/cross.png">