Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
a2622374
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
a2622374
编写于
5月 27, 2013
作者:
V
vkarnauk
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8010721: [macosx] In JDK7 the menu bar disappears when a Dialog is shown
Reviewed-by: anthony, serb
上级
d32431b9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
3 deletion
+16
-3
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+10
-1
src/macosx/native/sun/awt/AWTWindow.m
src/macosx/native/sun/awt/AWTWindow.m
+6
-2
未找到文件。
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
浏览文件 @
a2622374
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011,
2013,
Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -115,6 +115,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
static
final
int
RESIZABLE
=
1
<<
9
;
// both a style bit and prop bit
static
final
int
NONACTIVATING
=
1
<<
24
;
static
final
int
IS_DIALOG
=
1
<<
25
;
static
final
int
IS_MODAL
=
1
<<
26
;
static
final
int
_STYLE_PROP_BITMASK
=
DECORATED
|
TEXTURED
|
UNIFIED
|
UTILITY
|
HUD
|
SHEET
|
CLOSEABLE
|
MINIMIZABLE
|
RESIZABLE
;
...
...
@@ -374,6 +376,13 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
}
}
if
(
isDialog
)
{
styleBits
=
SET
(
styleBits
,
IS_DIALOG
,
true
);
if
(((
Dialog
)
target
).
isModal
())
{
styleBits
=
SET
(
styleBits
,
IS_MODAL
,
true
);
}
}
peer
.
setTextured
(
IS
(
TEXTURED
,
styleBits
));
return
styleBits
;
...
...
src/macosx/native/sun/awt/AWTWindow.m
浏览文件 @
a2622374
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011,
2013,
Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -536,8 +536,12 @@ AWT_ASSERT_APPKIT_THREAD;
-
(
void
)
windowDidBecomeKey
:
(
NSNotification
*
)
notification
{
AWT_ASSERT_APPKIT_THREAD
;
[
AWTToolkit
eventCountPlusPlus
];
[
CMenuBar
activate
:
self
.
javaMenuBar
modallyDisabled
:
NO
];
AWTWindow
*
opposite
=
[
AWTWindow
lastKeyWindow
];
if
(
!
IS
(
self
.
styleBits
,
IS_DIALOG
))
{
[
CMenuBar
activate
:
self
.
javaMenuBar
modallyDisabled
:
NO
];
}
else
if
(
IS
(
self
.
styleBits
,
IS_MODAL
))
{
[
CMenuBar
activate
:
opposite
->
javaMenuBar
modallyDisabled
:
YES
];
}
[
AWTWindow
setLastKeyWindow
:
nil
];
[
self
_deliverWindowFocusEvent
:
YES
oppositeWindow
:
opposite
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录