mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac OS text input: corrected minor issue when text widget is in a subwindow.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9770 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2012-12-20 15:12:32 +00:00
parent 70ea6b8d7c
commit 4ab7e91c61
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Fl_cocoa.mm
View File

@ -2012,10 +2012,21 @@ static void q_set_window_title(NSWindow *nsw, const char * name, const char *mi
glyphRect.origin.y = (CGFloat)y + current->textsize();
glyphRect.size.height = current->textsize();
} else {
glyphRect.origin.x = focus->x();
glyphRect.origin.y = focus->y() + focus->h();
if (focus->as_window()) {
glyphRect.origin.x = 0;
glyphRect.origin.y = focus->h();
}
else {
glyphRect.origin.x = focus->x();
glyphRect.origin.y = focus->y() + focus->h();
}
glyphRect.size.height = 12;
}
Fl_Window *win = focus->window();
while (win != NULL && win != wfocus) {
glyphRect.origin.y += win->y();
win = win->window();
}
// Convert the rect to screen coordinates
glyphRect.origin.y = wfocus->h() - glyphRect.origin.y;
glyphRect.origin = [[self window] convertBaseToScreen:glyphRect.origin];