i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

we check GetHasGlyphs for deadkeys characters too

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14055 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2005-08-23 12:27:25 +00:00
parent 3450200876
commit faccea3911
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/keymap/KeymapWindow.cpp
+3 -4
View File
@@ -1239,14 +1239,13 @@ MapView::DrawKey(uint32 keyCode)
} }
char *str; char *str = NULL;
int32 numBytes; int32 numBytes;
fCurrentMap->GetChars(keyCode, fOldKeyInfo.modifiers, fActiveDeadKey, &str, &numBytes); fCurrentMap->GetChars(keyCode, fOldKeyInfo.modifiers, fActiveDeadKey, &str, &numBytes);
if (str) { if (str) {
bool hasGlyphs; bool hasGlyphs;
if (deadKey>0) { if (deadKey>0) {
delete str; delete str;
hasGlyphs = true;
switch (deadKey) { switch (deadKey) {
case 1: str = strdup("'"); break; case 1: str = strdup("'"); break;
case 2: str = strdup("`"); break; case 2: str = strdup("`"); break;
@@ -1254,8 +1253,8 @@ MapView::DrawKey(uint32 keyCode)
case 4: str = strdup("\""); break; case 4: str = strdup("\""); break;
case 5: str = strdup("~"); break; case 5: str = strdup("~"); break;
} }
} else }
fCurrentFont.GetHasGlyphs(str, 1, &hasGlyphs); fCurrentFont.GetHasGlyphs(str, 1, &hasGlyphs);
if (hasGlyphs) { if (hasGlyphs) {
SetFont(&fCurrentFont); SetFont(&fCurrentFont);