stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Make sure the gray icon is selected when hiding the security warning

Reviewed-by: art, dcherepanov
This commit is contained in:
Anthony Petrov 2009-12-02 14:51:39 +03:00
parent d7b200bf35
commit 44e0bda21c
2 changed files with 5 additions and 1 deletions
jdk/src/windows/native/sun/windows
awt_Toolkit.cppawt_Window.cpp

1
jdk/src/windows/native/sun/windows/awt_Toolkit.cpp

@ -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.

5
jdk/src/windows/native/sun/windows/awt_Window.cpp

@ -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;
} }