Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
eced4411
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eced4411
编写于
4月 21, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Composite icons generate fix (HighDPI)
Former-commit-id:
075555a6
上级
0e0b04f5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
28 deletion
+24
-28
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/DBeaverIcons.java
...s.dbeaver.core/src/org/jkiss/dbeaver/ui/DBeaverIcons.java
+3
-3
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/OverlayImageDescriptor.java
...core/src/org/jkiss/dbeaver/ui/OverlayImageDescriptor.java
+21
-25
未找到文件。
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/DBeaverIcons.java
浏览文件 @
eced4411
...
...
@@ -45,12 +45,12 @@ public class DBeaverIcons
Image
image
;
ImageDescriptor
imageDescriptor
;
public
IconDescriptor
(
String
id
,
ImageDescriptor
imageDescriptor
)
{
IconDescriptor
(
String
id
,
ImageDescriptor
imageDescriptor
)
{
this
.
id
=
id
;
this
.
image
=
imageDescriptor
.
createImage
(
false
);
this
.
imageDescriptor
=
imageDescriptor
;
}
public
IconDescriptor
(
String
id
,
Image
image
)
{
IconDescriptor
(
String
id
,
Image
image
)
{
this
.
id
=
id
;
this
.
image
=
image
;
this
.
imageDescriptor
=
ImageDescriptor
.
createFromImage
(
image
);
...
...
@@ -112,7 +112,7 @@ public class DBeaverIcons
(
image
.
getBottomRight
()
==
null
?
""
:
image
.
getBottomRight
().
getLocation
());
IconDescriptor
icon
=
compositeMap
.
get
(
compositeId
);
if
(
icon
==
null
)
{
OverlayImageDescriptor
ovrImage
=
new
OverlayImageDescriptor
(
mainIcon
.
image
.
getImageData
()
);
OverlayImageDescriptor
ovrImage
=
new
OverlayImageDescriptor
(
mainIcon
.
image
Descriptor
);
if
(
image
.
getTopLeft
()
!=
null
)
ovrImage
.
setTopLeft
(
new
ImageDescriptor
[]
{
getImageDescriptor
(
image
.
getTopLeft
())}
);
if
(
image
.
getTopRight
()
!=
null
)
ovrImage
.
setTopRight
(
new
ImageDescriptor
[]{
getImageDescriptor
(
image
.
getTopRight
())
});
if
(
image
.
getBottomLeft
()
!=
null
)
ovrImage
.
setBottomLeft
(
new
ImageDescriptor
[]{
getImageDescriptor
(
image
.
getBottomLeft
())});
...
...
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/OverlayImageDescriptor.java
浏览文件 @
eced4411
...
...
@@ -18,7 +18,6 @@ package org.jkiss.dbeaver.ui;
import
org.eclipse.jface.resource.CompositeImageDescriptor
;
import
org.eclipse.jface.resource.ImageDescriptor
;
import
org.eclipse.swt.graphics.ImageData
;
import
org.eclipse.swt.graphics.Point
;
/**
...
...
@@ -26,17 +25,14 @@ import org.eclipse.swt.graphics.Point;
*/
public
class
OverlayImageDescriptor
extends
CompositeImageDescriptor
{
static
final
int
DEFAULT_WIDTH
=
16
;
static
final
int
DEFAULT_HEIGHT
=
16
;
private
Point
imageSize
=
null
;
private
ImageData
baseImageData
;
private
CachedImageDataProvider
baseImageData
;
private
ImageDescriptor
[]
topLeft
,
topRight
,
bottomLeft
,
bottomRight
;
public
OverlayImageDescriptor
(
ImageD
ata
baseImageData
)
{
this
.
baseImageData
=
baseImageData
;
this
.
imageSize
=
new
Point
(
baseImageData
.
width
,
baseImageData
.
height
);
public
OverlayImageDescriptor
(
ImageD
escriptor
baseImage
)
{
this
.
baseImageData
=
createCachedImageDataProvider
(
baseImage
)
;
this
.
imageSize
=
new
Point
(
baseImageData
.
getWidth
(),
baseImageData
.
getHeight
()
);
}
public
void
setTopLeft
(
ImageDescriptor
[]
topLeft
)
...
...
@@ -61,7 +57,7 @@ public class OverlayImageDescriptor extends CompositeImageDescriptor {
@Override
protected
void
drawCompositeImage
(
int
width
,
int
height
)
{
ImageData
base
=
baseImageData
;
CachedImageDataProvider
base
=
baseImageData
;
drawImage
(
base
,
0
,
0
);
if
(
topRight
!=
null
)
drawTopRight
(
topRight
);
...
...
@@ -81,56 +77,56 @@ public class OverlayImageDescriptor extends CompositeImageDescriptor {
return
imageSize
;
}
pr
otected
void
drawTopLeft
(
ImageDescriptor
[]
overlays
)
{
pr
ivate
void
drawTopLeft
(
ImageDescriptor
[]
overlays
)
{
if
(
overlays
==
null
)
return
;
int
length
=
overlays
.
length
;
int
x
=
0
;
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
if
(
i
<
length
&&
overlays
[
i
]
!=
null
)
{
ImageData
id
=
overlays
[
i
].
getImageData
(
);
drawImage
(
id
,
x
,
0
);
x
+=
id
.
width
;
CachedImageDataProvider
idp
=
createCachedImageDataProvider
(
overlays
[
i
]
);
drawImage
(
id
p
,
x
,
0
);
x
+=
id
p
.
getWidth
()
;
}
}
}
pr
otected
void
drawTopRight
(
ImageDescriptor
[]
overlays
)
{
pr
ivate
void
drawTopRight
(
ImageDescriptor
[]
overlays
)
{
if
(
overlays
==
null
)
return
;
int
length
=
overlays
.
length
;
int
x
=
getSize
().
x
;
for
(
int
i
=
2
;
i
>=
0
;
i
--)
{
if
(
i
<
length
&&
overlays
[
i
]
!=
null
)
{
ImageData
id
=
overlays
[
i
].
getImageData
(
);
x
-=
id
.
width
;
drawImage
(
id
,
x
,
0
);
CachedImageDataProvider
idp
=
createCachedImageDataProvider
(
overlays
[
i
]
);
x
-=
id
p
.
getWidth
()
;
drawImage
(
id
p
,
x
,
0
);
}
}
}
pr
otected
void
drawBottomLeft
(
ImageDescriptor
[]
overlays
)
{
pr
ivate
void
drawBottomLeft
(
ImageDescriptor
[]
overlays
)
{
if
(
overlays
==
null
)
return
;
int
length
=
overlays
.
length
;
int
x
=
0
;
for
(
int
i
=
0
;
i
<
3
;
i
++)
{
if
(
i
<
length
&&
overlays
[
i
]
!=
null
)
{
ImageData
id
=
overlays
[
i
].
getImageData
(
);
drawImage
(
id
,
x
,
getSize
().
y
-
id
.
height
);
x
+=
id
.
width
;
CachedImageDataProvider
idp
=
createCachedImageDataProvider
(
overlays
[
i
]
);
drawImage
(
id
p
,
x
,
getSize
().
y
-
idp
.
getHeight
()
);
x
+=
id
p
.
getWidth
()
;
}
}
}
pr
otected
void
drawBottomRight
(
ImageDescriptor
[]
overlays
)
{
pr
ivate
void
drawBottomRight
(
ImageDescriptor
[]
overlays
)
{
if
(
overlays
==
null
)
return
;
int
length
=
overlays
.
length
;
int
x
=
getSize
().
x
;
for
(
int
i
=
2
;
i
>=
0
;
i
--)
{
if
(
i
<
length
&&
overlays
[
i
]
!=
null
)
{
ImageData
id
=
overlays
[
i
].
getImageData
(
);
x
-=
id
.
width
;
drawImage
(
id
,
x
,
getSize
().
y
-
id
.
height
);
CachedImageDataProvider
idp
=
createCachedImageDataProvider
(
overlays
[
i
]
);
x
-=
id
p
.
getWidth
()
;
drawImage
(
id
p
,
x
,
getSize
().
y
-
idp
.
getHeight
()
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录