zhaoyushun1999/CPF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/csharpui/CPF.git into my

Browse Source
This commit is contained in:
新无止竞 2025-01-15 15:32:09 +08:00
commit 4e65d72804
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CPF.Linux/X11Window.cs
View File

@ -1532,11 +1532,12 @@ namespace CPF.Linux
var data = new UIntPtr[_width * _height + 2]; var data = new UIntPtr[_width * _height + 2];
data[0] = new UIntPtr((uint)_width); data[0] = new UIntPtr((uint)_width);
data[1] = new UIntPtr((uint)_height); data[1] = new UIntPtr((uint)_height);
var offset = 2;
for (var y = 0; y < _height; y++) for (var y = 0; y < _height; y++)
{ {
var r = y * _width; var r = y * _width;
for (var x = 0; x < _width; x++) for (var x = 0; x < _width; x++)
data[r + x] = new UIntPtr(_bdata[r + x]); data[r + x + offset] = new UIntPtr(_bdata[r + x]);
} }
fixed (void* pdata = data) fixed (void* pdata = data)

2
CPF.Windows/UnmanagedMethods.cs
View File

@ -1154,6 +1154,8 @@ BLENDFUNCTION blendFunction // alpha-blending function
[DllImport("user32.dll")] [DllImport("user32.dll")]
public static extern bool SetFocus(IntPtr hWnd); public static extern bool SetFocus(IntPtr hWnd);
[DllImport("user32.dll")] [DllImport("user32.dll")]
public static extern IntPtr GetFocus();
[DllImport("user32.dll")]
public static extern bool SetParent(IntPtr hWnd, IntPtr hWndNewParent); public static extern bool SetParent(IntPtr hWnd, IntPtr hWndNewParent);
[DllImport("user32.dll")] [DllImport("user32.dll")]
public static extern bool ShowWindow(IntPtr hWnd, ShowWindowCommand nCmdShow); public static extern bool ShowWindow(IntPtr hWnd, ShowWindowCommand nCmdShow);

4
CPF.Windows/WindowImpl.cs
View File

@ -1525,6 +1525,10 @@ namespace CPF.Windows
public void SetIMEPosition(Point point) public void SetIMEPosition(Point point)
{ {
if (canActivate && GetFocus() != handle)
{
SetFocus(handle);
}
COMPOSITIONFORM cf = new COMPOSITIONFORM(); COMPOSITIONFORM cf = new COMPOSITIONFORM();
cf.dwStyle = 2; cf.dwStyle = 2;
cf.ptCurrentPos = new POINT((int)(point.X * scaling), (int)(point.Y * scaling)); cf.ptCurrentPos = new POINT((int)(point.X * scaling), (int)(point.Y * scaling));