Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
964b6207
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看板
提交
964b6207
编写于
7月 12, 2019
作者:
P
psadhukhan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8225423: GTK L&F: JSplitPane: There is no divider shown
Reviewed-by: prr, serb
上级
d5628847
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
13 deletion
+24
-13
src/solaris/native/sun/awt/gtk3_interface.c
src/solaris/native/sun/awt/gtk3_interface.c
+22
-11
src/solaris/native/sun/awt/gtk3_interface.h
src/solaris/native/sun/awt/gtk3_interface.h
+2
-2
未找到文件。
src/solaris/native/sun/awt/gtk3_interface.c
浏览文件 @
964b6207
...
@@ -477,8 +477,7 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
...
@@ -477,8 +477,7 @@ GtkApi* gtk3_load(JNIEnv *env, const char* lib_name)
fp_gtk_fixed_new
=
dl_symbol
(
"gtk_fixed_new"
);
fp_gtk_fixed_new
=
dl_symbol
(
"gtk_fixed_new"
);
fp_gtk_handle_box_new
=
dl_symbol
(
"gtk_handle_box_new"
);
fp_gtk_handle_box_new
=
dl_symbol
(
"gtk_handle_box_new"
);
fp_gtk_image_new
=
dl_symbol
(
"gtk_image_new"
);
fp_gtk_image_new
=
dl_symbol
(
"gtk_image_new"
);
fp_gtk_hpaned_new
=
dl_symbol
(
"gtk_hpaned_new"
);
fp_gtk_paned_new
=
dl_symbol
(
"gtk_paned_new"
);
fp_gtk_vpaned_new
=
dl_symbol
(
"gtk_vpaned_new"
);
fp_gtk_scale_new
=
dl_symbol
(
"gtk_scale_new"
);
fp_gtk_scale_new
=
dl_symbol
(
"gtk_scale_new"
);
fp_gtk_hscrollbar_new
=
dl_symbol
(
"gtk_hscrollbar_new"
);
fp_gtk_hscrollbar_new
=
dl_symbol
(
"gtk_hscrollbar_new"
);
fp_gtk_vscrollbar_new
=
dl_symbol
(
"gtk_vscrollbar_new"
);
fp_gtk_vscrollbar_new
=
dl_symbol
(
"gtk_vscrollbar_new"
);
...
@@ -1081,7 +1080,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
...
@@ -1081,7 +1080,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
case
SPLIT_PANE
:
case
SPLIT_PANE
:
if
(
init_result
=
(
NULL
==
gtk3_widgets
[
_GTK_HPANED_TYPE
]))
if
(
init_result
=
(
NULL
==
gtk3_widgets
[
_GTK_HPANED_TYPE
]))
{
{
gtk3_widgets
[
_GTK_HPANED_TYPE
]
=
(
*
fp_gtk_
hpaned_new
)(
);
gtk3_widgets
[
_GTK_HPANED_TYPE
]
=
(
*
fp_gtk_
paned_new
)(
GTK_ORIENTATION_HORIZONTAL
);
}
}
result
=
gtk3_widgets
[
_GTK_HPANED_TYPE
];
result
=
gtk3_widgets
[
_GTK_HPANED_TYPE
];
break
;
break
;
...
@@ -1314,7 +1313,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
...
@@ -1314,7 +1313,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
case
VSPLIT_PANE_DIVIDER
:
case
VSPLIT_PANE_DIVIDER
:
if
(
init_result
=
(
NULL
==
gtk3_widgets
[
_GTK_VPANED_TYPE
]))
if
(
init_result
=
(
NULL
==
gtk3_widgets
[
_GTK_VPANED_TYPE
]))
{
{
gtk3_widgets
[
_GTK_VPANED_TYPE
]
=
(
*
fp_gtk_
vpaned_new
)(
);
gtk3_widgets
[
_GTK_VPANED_TYPE
]
=
(
*
fp_gtk_
paned_new
)(
GTK_ORIENTATION_VERTICAL
);
}
}
result
=
gtk3_widgets
[
_GTK_VPANED_TYPE
];
result
=
gtk3_widgets
[
_GTK_VPANED_TYPE
];
break
;
break
;
...
@@ -1434,6 +1433,10 @@ static GtkStyleContext* get_style(WidgetType widget_type, const gchar *detail)
...
@@ -1434,6 +1433,10 @@ static GtkStyleContext* get_style(WidgetType widget_type, const gchar *detail)
}
else
if
(
strcmp
(
detail
,
"option"
)
==
0
)
{
}
else
if
(
strcmp
(
detail
,
"option"
)
==
0
)
{
path
=
createWidgetPath
(
NULL
);
path
=
createWidgetPath
(
NULL
);
append_element
(
path
,
"radio"
);
append_element
(
path
,
"radio"
);
}
else
if
(
strcmp
(
detail
,
"paned"
)
==
0
)
{
path
=
createWidgetPath
(
fp_gtk_style_context_get_path
(
widget_context
));
append_element
(
path
,
"paned"
);
append_element
(
path
,
"separator"
);
}
else
{
}
else
{
path
=
createWidgetPath
(
fp_gtk_style_context_get_path
(
widget_context
));
path
=
createWidgetPath
(
fp_gtk_style_context_get_path
(
widget_context
));
append_element
(
path
,
detail
);
append_element
(
path
,
detail
);
...
@@ -1832,22 +1835,30 @@ static void gtk3_paint_handle(WidgetType widget_type, GtkStateType state_type,
...
@@ -1832,22 +1835,30 @@ static void gtk3_paint_handle(WidgetType widget_type, GtkStateType state_type,
{
{
gtk3_widget
=
gtk3_get_widget
(
widget_type
);
gtk3_widget
=
gtk3_get_widget
(
widget_type
);
GtkStyleContext
*
context
=
fp_gtk_widget_get_style_context
(
gtk3_widget
);
GtkStyleContext
*
context
=
get_style
(
widget_type
,
detail
);
fp_gtk_style_context_save
(
context
);
GtkStateFlags
flags
=
get_gtk_flags
(
state_type
);
GtkStateFlags
flags
=
get_gtk_flags
(
state_type
);
fp_gtk_style_context_set_state
(
context
,
GTK_STATE_FLAG_PRELIGHT
);
fp_gtk_style_context_set_state
(
context
,
GTK_STATE_FLAG_PRELIGHT
);
if
(
detail
!=
0
)
{
if
(
detail
!=
0
&&
!
(
strcmp
(
detail
,
"paned"
)
==
0
)
)
{
transform_detail_string
(
detail
,
context
);
transform_detail_string
(
detail
,
context
);
fp_gtk_style_context_add_class
(
context
,
"handlebox_bin"
);
fp_gtk_style_context_add_class
(
context
,
"handlebox_bin"
);
}
}
fp_gtk_render_handle
(
context
,
cr
,
x
,
y
,
width
,
height
);
if
(
!
(
strcmp
(
detail
,
"paned"
)
==
0
))
{
fp_gtk_render_background
(
context
,
cr
,
x
,
y
,
width
,
height
);
fp_gtk_render_handle
(
context
,
cr
,
x
,
y
,
width
,
height
);
fp_gtk_render_background
(
context
,
cr
,
x
,
y
,
width
,
height
);
}
else
{
if
(
orientation
==
GTK_ORIENTATION_VERTICAL
)
{
fp_gtk_render_handle
(
context
,
cr
,
x
+
width
/
2
,
y
,
2
,
height
);
fp_gtk_render_background
(
context
,
cr
,
x
+
width
/
2
,
y
,
2
,
height
);
}
else
{
fp_gtk_render_handle
(
context
,
cr
,
x
,
y
+
height
/
2
,
width
,
2
);
fp_gtk_render_background
(
context
,
cr
,
x
,
y
+
height
/
2
,
width
,
2
);
}
}
fp_gtk_style_context_restore
(
context
);
disposeOrRestoreContext
(
context
);
}
}
static
void
gtk3_paint_hline
(
WidgetType
widget_type
,
GtkStateType
state_type
,
static
void
gtk3_paint_hline
(
WidgetType
widget_type
,
GtkStateType
state_type
,
...
...
src/solaris/native/sun/awt/gtk3_interface.h
浏览文件 @
964b6207
...
@@ -163,6 +163,7 @@ typedef void GtkRange;
...
@@ -163,6 +163,7 @@ typedef void GtkRange;
typedef
void
GtkProgressBar
;
typedef
void
GtkProgressBar
;
typedef
void
GtkProgress
;
typedef
void
GtkProgress
;
typedef
void
GtkWidgetPath
;
typedef
void
GtkWidgetPath
;
typedef
void
GtkPaned
;
/* Some real structures */
/* Some real structures */
typedef
struct
typedef
struct
...
@@ -502,8 +503,7 @@ static GtkWidget* (*fp_gtk_combo_box_entry_new)();
...
@@ -502,8 +503,7 @@ static GtkWidget* (*fp_gtk_combo_box_entry_new)();
static
GtkWidget
*
(
*
fp_gtk_entry_new
)();
static
GtkWidget
*
(
*
fp_gtk_entry_new
)();
static
GtkWidget
*
(
*
fp_gtk_fixed_new
)();
static
GtkWidget
*
(
*
fp_gtk_fixed_new
)();
static
GtkWidget
*
(
*
fp_gtk_handle_box_new
)();
static
GtkWidget
*
(
*
fp_gtk_handle_box_new
)();
static
GtkWidget
*
(
*
fp_gtk_hpaned_new
)();
static
GtkWidget
*
(
*
fp_gtk_paned_new
)(
GtkOrientation
orientation
);
static
GtkWidget
*
(
*
fp_gtk_vpaned_new
)();
static
GtkWidget
*
(
*
fp_gtk_scale_new
)(
GtkOrientation
orientation
,
static
GtkWidget
*
(
*
fp_gtk_scale_new
)(
GtkOrientation
orientation
,
GtkAdjustment
*
adjustment
);
GtkAdjustment
*
adjustment
);
static
GtkWidget
*
(
*
fp_gtk_hscrollbar_new
)(
GtkAdjustment
*
adjustment
);
static
GtkWidget
*
(
*
fp_gtk_hscrollbar_new
)(
GtkAdjustment
*
adjustment
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录