gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows platform: account for GUI scaling when using input method.

Browse Source
This commit is contained in:
ManoloFLTK 2021-12-13 10:39:54 +01:00
parent 95d862fd5a
commit 3565aa1e60
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
View File

@ -259,8 +259,7 @@ extern flTypeImmReleaseContext flImmReleaseContext;
void Fl_GDI_Graphics_Driver::set_spot(int font, int size, int X, int Y, int W, int H, Fl_Window *win)
{
if (!win) return;
Fl_Window* tw = win;
while (tw->parent()) tw = tw->window(); // find top level window
Fl_Window* tw = win->top_window();
if (!tw->shown())
return;
@ -269,9 +268,10 @@ void Fl_GDI_Graphics_Driver::set_spot(int font, int size, int X, int Y, int W, i
if (himc) {
COMPOSITIONFORM cfs;
float s = scale();
cfs.dwStyle = CFS_POINT;
cfs.ptCurrentPos.x = X;
cfs.ptCurrentPos.y = Y - tw->labelsize();
cfs.ptCurrentPos.x = X * s;
cfs.ptCurrentPos.y = int(Y * s) - int(tw->labelsize() * s);
MapWindowPoints(fl_xid(win), fl_xid(tw), &cfs.ptCurrentPos, 1);
flImmSetCompositionWindow(himc, &cfs);
flImmReleaseContext(fl_xid(tw), himc);