Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
4aa133d2
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
未验证
提交
4aa133d2
编写于
10月 28, 2020
作者:
S
Serge Rider
提交者:
GitHub
10月 28, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10196 from dbeaver/text-color#5534
#5534 make cell foreground color contrasting
上级
11f2e515
db2f698a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
13 addition
and
14 deletion
+13
-14
plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/view/DatabaseTasksTree.java
...rc/org/jkiss/dbeaver/tasks/ui/view/DatabaseTasksTree.java
+1
-2
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
...ntrols/resultset/spreadsheet/SpreadsheetPresentation.java
+1
-5
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java
...rg.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java
+11
-7
未找到文件。
plugins/org.jkiss.dbeaver.tasks.ui/src/org/jkiss/dbeaver/tasks/ui/view/DatabaseTasksTree.java
浏览文件 @
4aa133d2
...
@@ -69,8 +69,7 @@ public class DatabaseTasksTree {
...
@@ -69,8 +69,7 @@ public class DatabaseTasksTree {
ColorRegistry
colorRegistry
=
UIUtils
.
getActiveWorkbenchWindow
().
getWorkbench
().
getThemeManager
().
getCurrentTheme
().
getColorRegistry
();
ColorRegistry
colorRegistry
=
UIUtils
.
getActiveWorkbenchWindow
().
getWorkbench
().
getThemeManager
().
getCurrentTheme
().
getColorRegistry
();
colorError
=
colorRegistry
.
get
(
"org.jkiss.dbeaver.txn.color.reverted.background"
);
colorError
=
colorRegistry
.
get
(
"org.jkiss.dbeaver.txn.color.reverted.background"
);
colorErrorForeground
=
UIUtils
.
getContrastColor
(
colorError
);
colorErrorForeground
=
UIUtils
.
getContrastColor
(
colorError
);
composite
.
addDisposeListener
(
e
->
colorErrorForeground
.
dispose
());
taskViewer
=
DialogUtils
.
createFilteredTree
(
composite
,
taskViewer
=
DialogUtils
.
createFilteredTree
(
composite
,
SWT
.
MULTI
|
SWT
.
FULL_SELECTION
|
(
selector
?
SWT
.
BORDER
|
SWT
.
CHECK
:
SWT
.
NONE
),
SWT
.
MULTI
|
SWT
.
FULL_SELECTION
|
(
selector
?
SWT
.
BORDER
|
SWT
.
CHECK
:
SWT
.
NONE
),
new
NamedObjectPatternFilter
(),
TaskUIMessages
.
db_tasks_tree_text_tasks_type
);
new
NamedObjectPatternFilter
(),
TaskUIMessages
.
db_tasks_tree_text_tasks_type
);
...
...
plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java
浏览文件 @
4aa133d2
...
@@ -1836,15 +1836,11 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
...
@@ -1836,15 +1836,11 @@ public class SpreadsheetPresentation extends AbstractPresentation implements IRe
boolean
recordMode
=
controller
.
isRecordMode
();
boolean
recordMode
=
controller
.
isRecordMode
();
ResultSetRow
row
=
(
ResultSetRow
)
(!
recordMode
?
rowElement
:
colElement
);
ResultSetRow
row
=
(
ResultSetRow
)
(!
recordMode
?
rowElement
:
colElement
);
DBDAttributeBinding
attribute
=
(
DBDAttributeBinding
)(!
recordMode
?
colElement
:
rowElement
);
DBDAttributeBinding
attribute
=
(
DBDAttributeBinding
)(!
recordMode
?
colElement
:
rowElement
);
Color
fg
=
controller
.
getLabelProvider
().
getCellForeground
(
attribute
,
row
);
Color
fg
=
controller
.
getLabelProvider
().
getCellForeground
(
attribute
,
row
);
if
(
fg
!=
null
)
{
if
(
fg
!=
null
)
{
return
fg
;
return
fg
;
}
}
if
(
foregroundDefault
==
null
)
{
return
UIUtils
.
getContrastColor
(
getCellBackground
(
colElement
,
rowElement
,
false
));
foregroundDefault
=
controller
.
getDefaultForeground
();
}
return
foregroundDefault
;
}
}
@Nullable
@Nullable
...
...
plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java
浏览文件 @
4aa133d2
...
@@ -89,6 +89,8 @@ public class UIUtils {
...
@@ -89,6 +89,8 @@ public class UIUtils {
private
static
final
Log
log
=
Log
.
getLog
(
UIUtils
.
class
);
private
static
final
Log
log
=
Log
.
getLog
(
UIUtils
.
class
);
public
static
final
String
INLINE_WIDGET_EDITOR_ID
=
"org.jkiss.dbeaver.ui.InlineWidgetEditor"
;
public
static
final
String
INLINE_WIDGET_EDITOR_ID
=
"org.jkiss.dbeaver.ui.InlineWidgetEditor"
;
private
static
final
Color
COLOR_BLACK
=
new
Color
(
null
,
0
,
0
,
0
);
private
static
final
Color
COLOR_WHITE
=
new
Color
(
null
,
255
,
255
,
255
);
private
static
SharedTextColors
sharedTextColors
=
new
SharedTextColors
();
private
static
SharedTextColors
sharedTextColors
=
new
SharedTextColors
();
private
static
SharedFonts
sharedFonts
=
new
SharedFonts
();
private
static
SharedFonts
sharedFonts
=
new
SharedFonts
();
...
@@ -1928,16 +1930,18 @@ public class UIUtils {
...
@@ -1928,16 +1930,18 @@ public class UIUtils {
/**
/**
* Calculate the Contrast color based on Luma(brightness)
* Calculate the Contrast color based on Luma(brightness)
* https://en.wikipedia.org/wiki/Luma_(video)
* https://en.wikipedia.org/wiki/Luma_(video)
*
* Do not dispose returned color.
*/
*/
public
static
Color
getContrastColor
(
Color
color
)
{
public
static
Color
getContrastColor
(
Color
color
)
{
if
(
color
==
null
)
if
(
color
==
null
)
{
return
new
Color
(
null
,
0
,
0
,
0
)
;
return
COLOR_BLACK
;
}
double
luminance
=
1
-
(
0.299
*
color
.
getRed
()
+
0.587
*
color
.
getGreen
()
+
0.114
*
color
.
getBlue
())
/
255
;
double
luminance
=
1
-
(
0.299
*
color
.
getRed
()
+
0.587
*
color
.
getGreen
()
+
0.114
*
color
.
getBlue
())
/
255
;
if
(
luminance
>
0.5
)
{
int
c
=
(
luminance
>
0.5
)
?
255
:
0
;
return
COLOR_WHITE
;
}
return
new
Color
(
null
,
c
,
c
,
c
)
;
return
COLOR_BLACK
;
}
}
public
static
void
openWebBrowser
(
String
url
)
public
static
void
openWebBrowser
(
String
url
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录