Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
01547d9c
W
wpf
项目概览
dotNET Platform
/
wpf
大约 1 年 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wpf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
01547d9c
编写于
10月 24, 2019
作者:
V
Vatsan Madhavan
提交者:
GitHub
10月 24, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2097 from wpfcontrib/contextmenu_fixup
Context Menus are sometimes not shown in High-DPI applications
上级
b57b7bb5
0437c64a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
29 addition
and
7 deletion
+29
-7
src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/Popup.cs
...tionFramework/System/Windows/Controls/Primitives/Popup.cs
+29
-7
未找到文件。
src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/Primitives/Popup.cs
浏览文件 @
01547d9c
...
...
@@ -1510,7 +1510,7 @@ private void CreateWindow(bool asyncCall)
// cascading failure.
if
(
PopupInitialPlacementHelper
.
IsPerMonitorDpiScalingActive
)
{
DestroyWindow
();
DestroyWindow
Impl
();
_positionInfo
=
null
;
makeNewWindow
=
true
;
}
...
...
@@ -1601,18 +1601,40 @@ private void BuildWindow(Visual targetVisual)
_secHelper
.
BuildWindow
(
origin
.
x
,
origin
.
y
,
targetVisual
,
IsTransparent
,
PopupFilterMessage
,
OnWindowResize
,
OnDpiChanged
);
}
private
void
DestroyWindow
()
/// <summary>
/// Destroys the underlying window (HWND) if it is alive
/// </summary>
/// <returns>true if the window was destroyed, otherwise false</returns>
private
bool
DestroyWindowImpl
()
{
if
(
_secHelper
.
IsWindowAlive
())
{
_secHelper
.
DestroyWindow
(
PopupFilterMessage
,
OnWindowResize
,
OnDpiChanged
);
ReleasePopupCapture
();
return
true
;
}
// Raise closed event after popup has actually closed
OnClosed
(
EventArgs
.
Empty
);
return
false
;
}
// When closing, clear the placement target registration
UpdatePlacementTargetRegistration
(
PlacementTarget
,
null
);
/// <summary>
/// Destroys the window, and does additional book-keeping
/// like releasing the capture, raising Closed event, and
/// clearing placement-target registration
/// </summary>
private
void
DestroyWindow
()
{
if
(
_secHelper
.
IsWindowAlive
())
{
if
(
DestroyWindowImpl
())
{
ReleasePopupCapture
();
// Raise closed event after popup has actually closed
OnClosed
(
EventArgs
.
Empty
);
// When closing, clear the placement target registration
UpdatePlacementTargetRegistration
(
PlacementTarget
,
null
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录