提交 98869a89 编写于 作者: A anthony

6901021: Security Warning Icon not getting displayed properly when frame loses focus

Summary: Make sure the gray icon is selected when hiding the security warning
Reviewed-by: art, dcherepanov
上级 481fa434
...@@ -1518,6 +1518,7 @@ HICON AwtToolkit::GetAwtIconSm() ...@@ -1518,6 +1518,7 @@ HICON AwtToolkit::GetAwtIconSm()
return defaultIconSm; return defaultIconSm;
} }
// The icon at index 0 must be gray. See AwtWindow::GetSecurityWarningIcon()
HICON AwtToolkit::GetSecurityWarningIcon(UINT index, UINT w, UINT h) HICON AwtToolkit::GetSecurityWarningIcon(UINT index, UINT w, UINT h)
{ {
//Note: should not exceed 10 because of the current implementation. //Note: should not exceed 10 because of the current implementation.
......
...@@ -652,7 +652,10 @@ void AwtWindow::UnregisterWarningWindowClass() ...@@ -652,7 +652,10 @@ void AwtWindow::UnregisterWarningWindowClass()
HICON AwtWindow::GetSecurityWarningIcon() HICON AwtWindow::GetSecurityWarningIcon()
{ {
HICON ico = AwtToolkit::GetInstance().GetSecurityWarningIcon(securityWarningAnimationStage, // It is assumed that the icon at index 0 is gray
const UINT index = securityAnimationKind == akShow ?
securityWarningAnimationStage : 0;
HICON ico = AwtToolkit::GetInstance().GetSecurityWarningIcon(index,
warningWindowWidth, warningWindowHeight); warningWindowWidth, warningWindowHeight);
return ico; return ico;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册