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

6805231: Security Warning Icon is missing in Windows 2000 Prof from Jdk build 6u12

Browse Source 
The icon becomes layered only when the fading-out effect is being performed.

Reviewed-by: art, dcherepanov
This commit is contained in:
Anthony Petrov 2009-05-05 17:47:04 +04:00
parent b23fe07b43
commit 2453a64fc4
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jdk/src/windows/native/sun/windows/awt_Window.cpp
View File

@ -524,7 +524,7 @@ void AwtWindow::CreateWarningWindow(JNIEnv *env)
RegisterWarningWindowClass();
warningWindow = ::CreateWindowEx(
WS_EX_NOACTIVATE | WS_EX_LAYERED,
WS_EX_NOACTIVATE,
GetWarningWindowClassName(),
warningString,
WS_POPUP,
@ -536,7 +536,7 @@ void AwtWindow::CreateWarningWindow(JNIEnv *env)
NULL // lParam
);
if (warningWindow == NULL) {
//XXX: actually this is bad... We didn't manage to create the widow.
//XXX: actually this is bad... We didn't manage to create the window.
return;
}
@ -836,6 +836,19 @@ void AwtWindow::RepaintWarningWindow()
::ReleaseDC(warningWindow, hdc);
}
void AwtWindow::SetLayered(HWND window, bool layered)
{
const LONG ex_style = ::GetWindowLong(window, GWL_EXSTYLE);
::SetWindowLong(window, GWL_EXSTYLE, layered ?
ex_style | WS_EX_LAYERED : ex_style & ~WS_EX_LAYERED);
}
bool AwtWindow::IsLayered(HWND window)
{
const LONG ex_style = ::GetWindowLong(window, GWL_EXSTYLE);
return ex_style & WS_EX_LAYERED;
}
void AwtWindow::StartSecurityAnimation(AnimationKind kind)
{
if (!IsUntrusted()) {
@ -858,8 +871,14 @@ void AwtWindow::StartSecurityAnimation(AnimationKind kind)
::SetLayeredWindowAttributes(warningWindow, RGB(0, 0, 0),
0xFF, LWA_ALPHA);
AwtWindow::SetLayered(warningWindow, false);
::RedrawWindow(warningWindow, NULL, NULL,
RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN);
} else if (securityAnimationKind == akPreHide) {
// Pre-hiding means fading-out. We have to make the window layered.
// Note: Some VNC clients do not support layered windows, hence
// we dynamically turn it on and off. See 6805231.
AwtWindow::SetLayered(warningWindow, true);
}
}
@ -2528,8 +2547,6 @@ void AwtWindow::SetTranslucency(BYTE opacity, BOOL opaque)
HWND hwnd = GetHWnd();
LONG ex_style = ::GetWindowLong(hwnd, GWL_EXSTYLE);
if (opaque != old_opaque) {
::EnterCriticalSection(&contentBitmapCS);
if (hContentBitmap != NULL) {
@ -2541,21 +2558,22 @@ void AwtWindow::SetTranslucency(BYTE opacity, BOOL opaque)
if (opaque && opacity == 0xff) {
// Turn off all the effects
::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style & ~WS_EX_LAYERED);
AwtWindow::SetLayered(hwnd, false);
// Ask the window to repaint itself and all the children
RedrawWindow();
} else {
// We're going to enable some effects
if (!(ex_style & WS_EX_LAYERED)) {
::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style | WS_EX_LAYERED);
if (!AwtWindow::IsLayered(hwnd)) {
AwtWindow::SetLayered(hwnd, true);
} else {
if ((opaque && opacity < 0xff) ^ (old_opaque && old_opacity < 0xff)) {
// _One_ of the modes uses the SetLayeredWindowAttributes.
// Need to reset the style in this case.
// If both modes are simple (i.e. just changing the opacity level),
// no need to reset the style.
::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style & ~WS_EX_LAYERED);
::SetWindowLong(hwnd, GWL_EXSTYLE, ex_style | WS_EX_LAYERED);
AwtWindow::SetLayered(hwnd, false);
AwtWindow::SetLayered(hwnd, true);
}
}

3
jdk/src/windows/native/sun/windows/awt_Window.h
View File

@ -332,6 +332,9 @@ private:
void RepositionSecurityWarning(JNIEnv *env);
static void SetLayered(HWND window, bool layered);
static bool IsLayered(HWND window);
public:
void UpdateSecurityWarningVisibility();
static bool IsWarningWindow(HWND hWnd);