Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

编译目标为x86,netframework4.8的情况下报错 #1419

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

编译目标为x86,netframework4.8的情况下报错 #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b522e3
Update InteropValues.cs
asine Jun 24, 2023
38308f0
Update InteropMethods.cs
asine Jun 24, 2023
1194990
Update FullScreenHelper.cs
asine Jun 24, 2023
a5054a8
Merge branch 'HandyOrg:master' into master
asine Dec 21, 2023
21fa1d0
Merge branch 'HandyOrg:master' into master
asine Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Shared/HandyControl_Shared/Tools/Helper/FullScreenHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ internal static class FullScreenHelper
/// </summary>
private static readonly DependencyProperty BeforeFullScreenWindowPlacementProperty =
DependencyProperty.RegisterAttached("BeforeFullScreenWindowPlacement",
typeof(InteropValues.WINDOWPLACEMENT?), typeof(FullScreenHelper));
typeof(InteropValues.WINDOWPLACEMENT), typeof(FullScreenHelper));

/// <summary>
/// 用于记录窗口全屏前样式的附加属性
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/HandyControl_Shared/Tools/Interop/InteropMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ internal static extern IntPtr CreateWindowEx(

internal static InteropValues.WINDOWPLACEMENT GetWindowPlacement(IntPtr hwnd)
{
InteropValues.WINDOWPLACEMENT wINDOWPLACEMENT = InteropValues.WINDOWPLACEMENT.Default;
InteropValues.WINDOWPLACEMENT wINDOWPLACEMENT =new InteropValues.WINDOWPLACEMENT();
if (GetWindowPlacement(hwnd, wINDOWPLACEMENT))
{
return wINDOWPLACEMENT;
Expand Down
28 changes: 14 additions & 14 deletions src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,27 +362,27 @@ internal class WINDOWPOS
}

[StructLayout(LayoutKind.Sequential)]
internal struct WINDOWPLACEMENT
internal class WINDOWPLACEMENT
{
public int length;
public int length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
public int flags;
public SW showCmd;
public POINT ptMinPosition;
public POINT ptMaxPosition;
public RECT rcNormalPosition;

/// <summary>
/// Gets the default (empty) value.
/// </summary>
public static WINDOWPLACEMENT Default
{
get
{
WINDOWPLACEMENT result = new WINDOWPLACEMENT();
result.length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
return result;
}
}
///// <summary>
///// Gets the default (empty) value.
///// </summary>
//public static WINDOWPLACEMENT Default
//{
// get
// {
// WINDOWPLACEMENT result = new WINDOWPLACEMENT();
// result.length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
// return result;
// }
//}
}

[StructLayout(LayoutKind.Sequential, Pack = 4)]
Expand Down