Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
e37bd8b9
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,发现更多精彩内容 >>
提交
e37bd8b9
编写于
1月 24, 2013
作者:
M
malenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8003400: JTree scrolling problem when using large model in WindowsLookAndFeel
Reviewed-by: alexsch
上级
529ea062
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
132 addition
and
2 deletion
+132
-2
src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
+23
-2
test/javax/swing/JTree/8003400/Test8003400.java
test/javax/swing/JTree/8003400/Test8003400.java
+109
-0
未找到文件。
src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java
浏览文件 @
e37bd8b9
...
...
@@ -1879,6 +1879,20 @@ public class BasicTreeUI extends TreeUI
visRect
.
x
-=
i
.
left
;
visRect
.
y
-=
i
.
top
;
}
// we should consider a non-visible area above
Component
component
=
SwingUtilities
.
getUnwrappedParent
(
tree
);
if
(
component
instanceof
JViewport
)
{
component
=
component
.
getParent
();
if
(
component
instanceof
JScrollPane
)
{
JScrollPane
pane
=
(
JScrollPane
)
component
;
JScrollBar
bar
=
pane
.
getHorizontalScrollBar
();
if
((
bar
!=
null
)
&&
bar
.
isVisible
())
{
int
height
=
bar
.
getHeight
();
visRect
.
y
-=
height
;
visRect
.
height
+=
height
;
}
}
}
preferredSize
.
width
=
treeState
.
getPreferredWidth
(
visRect
);
}
else
{
...
...
@@ -4504,7 +4518,7 @@ public class BasicTreeUI extends TreeUI
}
}
private
void
home
(
JTree
tree
,
BasicTreeUI
ui
,
int
direction
,
private
void
home
(
JTree
tree
,
final
BasicTreeUI
ui
,
int
direction
,
boolean
addToSelection
,
boolean
changeSelection
)
{
// disable moving of lead unless in discontiguous mode
...
...
@@ -4514,7 +4528,7 @@ public class BasicTreeUI extends TreeUI
changeSelection
=
true
;
}
int
rowCount
=
ui
.
getRowCount
(
tree
);
final
int
rowCount
=
ui
.
getRowCount
(
tree
);
if
(
rowCount
>
0
)
{
if
(
direction
==
-
1
)
{
...
...
@@ -4566,6 +4580,13 @@ public class BasicTreeUI extends TreeUI
ui
.
setLeadSelectionPath
(
ui
.
getPathForRow
(
tree
,
rowCount
-
1
),
true
);
}
if
(
ui
.
isLargeModel
()){
SwingUtilities
.
invokeLater
(
new
Runnable
()
{
public
void
run
()
{
ui
.
ensureRowsAreVisible
(
rowCount
-
1
,
rowCount
-
1
);
}
});
}
}
}
}
...
...
test/javax/swing/JTree/8003400/Test8003400.java
0 → 100644
浏览文件 @
e37bd8b9
/*
* 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 8003400
* @summary Tests that JTree shows the last row
* @author Sergey Malenkov
* @run main/othervm Test8003400
* @run main/othervm Test8003400 reverse
* @run main/othervm Test8003400 system
* @run main/othervm Test8003400 system reverse
*/
import
sun.awt.SunToolkit
;
import
java.awt.Rectangle
;
import
java.awt.Robot
;
import
java.awt.Toolkit
;
import
java.awt.event.KeyEvent
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.List
;
import
javax.swing.JFrame
;
import
javax.swing.JScrollPane
;
import
javax.swing.JTree
;
import
javax.swing.SwingUtilities
;
import
javax.swing.UIManager
;
import
javax.swing.tree.DefaultMutableTreeNode
;
public
class
Test8003400
{
private
static
final
String
TITLE
=
"Test JTree with a large model"
;
private
static
List
<
String
>
OBJECTS
=
Arrays
.
asList
(
TITLE
,
"x"
,
"y"
,
"z"
);
private
static
JScrollPane
pane
;
public
static
void
main
(
String
[]
args
)
throws
Exception
{
for
(
String
arg
:
args
)
{
if
(
arg
.
equals
(
"reverse"
))
{
Collections
.
reverse
(
OBJECTS
);
}
if
(
arg
.
equals
(
"system"
))
{
UIManager
.
setLookAndFeel
(
UIManager
.
getSystemLookAndFeelClassName
());
}
}
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
public
void
run
()
{
DefaultMutableTreeNode
root
=
new
DefaultMutableTreeNode
();
JTree
tree
=
new
JTree
(
root
);
tree
.
setLargeModel
(
true
);
tree
.
setRowHeight
(
16
);
JFrame
frame
=
new
JFrame
(
TITLE
);
frame
.
add
(
pane
=
new
JScrollPane
(
tree
));
frame
.
setSize
(
200
,
100
);
frame
.
setLocationRelativeTo
(
null
);
frame
.
setDefaultCloseOperation
(
JFrame
.
DISPOSE_ON_CLOSE
);
frame
.
setVisible
(
true
);
for
(
String
object
:
OBJECTS
)
{
root
.
add
(
new
DefaultMutableTreeNode
(
object
));
}
tree
.
expandRow
(
0
);
}
});
SunToolkit
toolkit
=
(
SunToolkit
)
Toolkit
.
getDefaultToolkit
();
toolkit
.
realSync
(
500
);
new
Robot
().
keyPress
(
KeyEvent
.
VK_END
);
toolkit
.
realSync
(
500
);
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
public
void
run
()
{
JTree
tree
=
(
JTree
)
pane
.
getViewport
().
getView
();
Rectangle
inner
=
tree
.
getRowBounds
(
tree
.
getRowCount
()
-
1
);
Rectangle
outer
=
SwingUtilities
.
convertRectangle
(
tree
,
inner
,
pane
);
outer
.
y
+=
tree
.
getRowHeight
()
-
1
-
pane
.
getVerticalScrollBar
().
getHeight
();
// error reporting only for automatic testing
if
(
null
!=
System
.
getProperty
(
"test.src"
,
null
))
{
SwingUtilities
.
getWindowAncestor
(
pane
).
dispose
();
if
(
outer
.
y
!=
0
)
{
throw
new
Error
(
"TEST FAILED: "
+
outer
.
y
);
}
}
}
});
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录