github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-01 15:52:41 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ExtractAccessKey now stores position

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@997 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-03-22 10:07:45 +00:00
parent 36555d3712
commit ae292b5cf4
12 changed files with 219 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/Draw/DrawTextUtil.cpp
View file

@ -85,10 +85,13 @@ void DrawTLText(Draw& draw, int x, int y, int cx, const wchar *text,
int cy = font.Info().GetHeight();
const wchar *s = text;
const wchar *t = s;
int apos = HIWORD(accesskey);
int akey = LOWORD(accesskey);
for(;;) {
if(*s == '\n' || *s == '\0') {
int a = x;
const wchar *q = t;
const wchar *start = NULL;
while(q < s) {
while(q < s && *q < ' ') {
if(*q == '\t')
@ -97,14 +100,16 @@ void DrawTLText(Draw& draw, int x, int y, int cx, const wchar *text,
}
t = q;
bool ak = false;
start = q;
while(q < s && *q >= ' ') {
if(accesskey && ToUpper(ToAscii(*q)) == accesskey) {
if(akey && ToUpper(ToAscii(*q)) == akey && (apos == 0 || q - start + 1 == apos)) {
ak = true;
accesskey = 0;
akey = 0;
break;
}
q++;
}
start = NULL;
draw.DrawText(a, y, t, font, ink, (int)(q - t));
a += GetTextSize(t, font, (int)(q - t)).cx;
if(ak) {