erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-14 04:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

feat(windows): remove hotkey from pop-up. content-frame size

Browse source 
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.
This commit is contained in:
Ross 2022-10-19 15:22:03 +10:00
parent f3fdccf602
commit d4dee04c7f
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
windows/src/desktop/kmshell/xml/config.css
View file

@ -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;

3
windows/src/desktop/kmshell/xml/config.js
View file

@ -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');

6
windows/src/desktop/kmshell/xml/keyman_keyboardlist.xsl
View file

@ -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">