Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
4b246c34
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4b246c34
编写于
10月 11, 2013
作者:
P
pchelko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8026143: [macosx] Maximized state could be inconsistent between peer and frame
Reviewed-by: anthony, serb
上级
af34e26f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
135 addition
and
24 deletion
+135
-24
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
+30
-10
src/macosx/native/sun/awt/AWTWindow.m
src/macosx/native/sun/awt/AWTWindow.m
+0
-14
test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java
...va/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java
+105
-0
未找到文件。
src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
浏览文件 @
4b246c34
...
@@ -538,6 +538,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
...
@@ -538,6 +538,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
updateIconImages
();
updateIconImages
();
updateFocusabilityForAutoRequestFocus
(
false
);
updateFocusabilityForAutoRequestFocus
(
false
);
boolean
wasMaximized
=
isMaximized
();
// Actually show or hide the window
// Actually show or hide the window
LWWindowPeer
blocker
=
(
peer
==
null
)?
null
:
peer
.
getBlocker
();
LWWindowPeer
blocker
=
(
peer
==
null
)?
null
:
peer
.
getBlocker
();
if
(
blocker
==
null
||
!
visible
)
{
if
(
blocker
==
null
||
!
visible
)
{
...
@@ -571,16 +573,21 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
...
@@ -571,16 +573,21 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
if
(
visible
)
{
if
(
visible
)
{
// Apply the extended state as expected in shared code
// Apply the extended state as expected in shared code
if
(
target
instanceof
Frame
)
{
if
(
target
instanceof
Frame
)
{
switch
(((
Frame
)
target
).
getExtendedState
())
{
if
(!
wasMaximized
&&
isMaximized
())
{
case
Frame
.
ICONIFIED
:
// setVisible could have changed the native maximized state
CWrapper
.
NSWindow
.
miniaturize
(
nsWindowPtr
);
deliverZoom
(
true
);
break
;
}
else
{
case
Frame
.
MAXIMIZED_BOTH
:
switch
(((
Frame
)
target
).
getExtendedState
())
{
maximize
();
case
Frame
.
ICONIFIED
:
break
;
CWrapper
.
NSWindow
.
miniaturize
(
nsWindowPtr
);
default
:
// NORMAL
break
;
unmaximize
();
// in case it was maximized, otherwise this is a no-op
case
Frame
.
MAXIMIZED_BOTH
:
break
;
maximize
();
break
;
default
:
// NORMAL
unmaximize
();
// in case it was maximized, otherwise this is a no-op
break
;
}
}
}
}
}
}
}
...
@@ -927,6 +934,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
...
@@ -927,6 +934,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
return
;
return
;
}
}
checkZoom
();
final
Rectangle
oldB
=
nativeBounds
;
final
Rectangle
oldB
=
nativeBounds
;
nativeBounds
=
new
Rectangle
(
x
,
y
,
width
,
height
);
nativeBounds
=
new
Rectangle
(
x
,
y
,
width
,
height
);
if
(
peer
!=
null
)
{
if
(
peer
!=
null
)
{
...
@@ -957,6 +966,17 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
...
@@ -957,6 +966,17 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
}
}
}
}
private
void
checkZoom
()
{
if
(
target
instanceof
Frame
&&
isVisible
())
{
Frame
targetFrame
=
(
Frame
)
target
;
if
(
targetFrame
.
getExtendedState
()
!=
Frame
.
MAXIMIZED_BOTH
&&
isMaximized
())
{
deliverZoom
(
true
);
}
else
if
(
targetFrame
.
getExtendedState
()
==
Frame
.
MAXIMIZED_BOTH
&&
!
isMaximized
())
{
deliverZoom
(
false
);
}
}
}
private
void
deliverNCMouseDown
()
{
private
void
deliverNCMouseDown
()
{
if
(
peer
!=
null
)
{
if
(
peer
!=
null
)
{
peer
.
notifyNCMouseDown
();
peer
.
notifyNCMouseDown
();
...
...
src/macosx/native/sun/awt/AWTWindow.m
浏览文件 @
4b246c34
...
@@ -501,20 +501,6 @@ AWT_ASSERT_APPKIT_THREAD;
...
@@ -501,20 +501,6 @@ AWT_ASSERT_APPKIT_THREAD;
// window exposing in _setVisible:(BOOL)
// window exposing in _setVisible:(BOOL)
}
}
-
(
BOOL
)
windowShouldZoom
:(
NSWindow
*
)
window
toFrame
:(
NSRect
)
proposedFrame
{
AWT_ASSERT_APPKIT_THREAD
;
[
AWTToolkit
eventCountPlusPlus
];
JNIEnv
*
env
=
[
ThreadUtilities
getJNIEnv
];
jobject
platformWindow
=
[
self
.
javaPlatformWindow
jObjectWithEnv
:
env
];
if
(
platformWindow
!=
NULL
)
{
static
JNF_MEMBER_CACHE
(
jm_deliverZoom
,
jc_CPlatformWindow
,
"deliverZoom"
,
"(Z)V"
);
JNFCallVoidMethod
(
env
,
platformWindow
,
jm_deliverZoom
,
!
[
window
isZoomed
]);
(
*
env
)
->
DeleteLocalRef
(
env
,
platformWindow
);
}
return
YES
;
}
-
(
void
)
_deliverIconify
:(
BOOL
)
iconify
{
-
(
void
)
_deliverIconify
:(
BOOL
)
iconify
{
AWT_ASSERT_APPKIT_THREAD
;
AWT_ASSERT_APPKIT_THREAD
;
...
...
test/java/awt/Frame/MaximizedByPlatform/MaximizedByPlatform.java
0 → 100644
浏览文件 @
4b246c34
/*
* Copyright (c) 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8026143
* @summary [macosx] Maximized state could be inconsistent between peer and frame
* @author Petr Pchelko
* @run main MaximizedByPlatform
*/
import
sun.awt.OSInfo
;
import
sun.awt.SunToolkit
;
import
java.awt.*
;
public
class
MaximizedByPlatform
{
private
static
Frame
frame
;
private
static
Rectangle
availableScreenBounds
;
public
static
void
main
(
String
[]
args
)
{
if
(
OSInfo
.
getOSType
()
!=
OSInfo
.
OSType
.
MACOSX
)
{
// Test only for macosx. Pass
return
;
}
availableScreenBounds
=
getAvailableScreenBounds
();
// Test 1. The maximized state is set in setBounds
try
{
frame
=
new
Frame
();
frame
.
setBounds
(
100
,
100
,
100
,
100
);
frame
.
setVisible
(
true
);
((
SunToolkit
)
Toolkit
.
getDefaultToolkit
()).
realSync
();
frame
.
setBounds
(
availableScreenBounds
.
x
,
availableScreenBounds
.
y
,
availableScreenBounds
.
width
,
availableScreenBounds
.
height
);
((
SunToolkit
)
Toolkit
.
getDefaultToolkit
()).
realSync
();
if
(
frame
.
getExtendedState
()
!=
Frame
.
MAXIMIZED_BOTH
)
{
throw
new
RuntimeException
(
"Maximized state was not set for frame in setBounds"
);
}
}
finally
{
frame
.
dispose
();
}
// Test 2. The maximized state is set in setVisible
try
{
frame
=
new
Frame
();
frame
.
setBounds
(
availableScreenBounds
.
x
,
availableScreenBounds
.
y
,
availableScreenBounds
.
width
+
100
,
availableScreenBounds
.
height
);
frame
.
setVisible
(
true
);
((
SunToolkit
)
Toolkit
.
getDefaultToolkit
()).
realSync
();
if
(
frame
.
getExtendedState
()
!=
Frame
.
MAXIMIZED_BOTH
)
{
throw
new
RuntimeException
(
"Maximized state was not set for frame in setVisible"
);
}
}
finally
{
frame
.
dispose
();
}
}
private
static
Rectangle
getAvailableScreenBounds
()
{
final
Toolkit
toolkit
=
Toolkit
.
getDefaultToolkit
();
final
GraphicsEnvironment
graphicsEnvironment
=
GraphicsEnvironment
.
getLocalGraphicsEnvironment
();
final
GraphicsDevice
graphicsDevice
=
graphicsEnvironment
.
getDefaultScreenDevice
();
final
Dimension
screenSize
=
toolkit
.
getScreenSize
();
final
Insets
screenInsets
=
toolkit
.
getScreenInsets
(
graphicsDevice
.
getDefaultConfiguration
());
final
Rectangle
availableScreenBounds
=
new
Rectangle
(
screenSize
);
availableScreenBounds
.
x
+=
screenInsets
.
left
;
availableScreenBounds
.
y
+=
screenInsets
.
top
;
availableScreenBounds
.
width
-=
(
screenInsets
.
left
+
screenInsets
.
right
);
availableScreenBounds
.
height
-=
(
screenInsets
.
top
+
screenInsets
.
bottom
);
return
availableScreenBounds
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录