Switch back erroneously flipped layer palette mnemonics

Close #4504
fontforge · Nov 19, 2020 · 627ffa6 · 627ffa6
1 parent 21ad4a1
commit 627ffa6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/fontforgeexe/charview.c b/fontforgeexe/charview.c
@@ -8060,9 +8060,6 @@ return;
     } else if ( event->u.chr.keysym=='\\' && (event->u.chr.state&ksm_control) ) {
 	/* European keyboards need a funky modifier to get \ */
 	CVDoTransform(cv,cvt_none);
-    } else if ( (event->u.chr.keysym=='F' || event->u.chr.keysym=='B') &&
-            !(event->u.chr.state&(ksm_control|ksm_meta)) ) {
-        CVLSelectLayer(cv, event->u.chr.keysym=='F' ? 1 : 0);
     } else if ( (event->u.chr.state&ksm_control) && (event->u.chr.keysym=='-' || event->u.chr.keysym==0xffad/*XK_KP_Subtract*/) ){
 	    _CVMenuScale(cv, MID_ZoomOut);
     } else if ( (event->u.chr.state&ksm_control) && (event->u.chr.keysym=='=' || event->u.chr.keysym==0xffab/*XK_KP_Add*/) ){

diff --git a/fontforgeexe/cvpalettes.c b/fontforgeexe/cvpalettes.c
@@ -3162,10 +3162,10 @@ void CVSetLayer(CharView *cv,int layer) {
 /* Check if a key press corresponds to a mnemonic the palette knows about. */
 int CVPaletteMnemonicCheck(GEvent *event) {
     static struct strmatch { char *str; int cid; } strmatch[] = {
-/* GT: Foreground, make it short */
-	{ N_("F_ore"), CID_EFore },
 /* GT: Background, make it short */
 	{ N_("_Back"), CID_EBack },
+/* GT: Foreground, make it short */
+	{ N_("F_ore"), CID_EFore },
 /* GT: Guide layer, make it short */
 	{ N_("_Guide"), CID_EGrid },
 	{ NULL, 0 }