fly/fgdata
1
0
Fork 0
Code Activity

Fix to Canvas-GUI window transparency

Browse source 
Separate the window titlebar from the main background area, so the
transparency of each can be set independently.

From Henning Stalkhe.
This commit is contained in:
James Turner 2017-05-29 08:24:22 +01:00
parent 0b6ef218b1
commit cc14717930
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Nasal/canvas/gui.nas
View file

@ -70,7 +70,9 @@ var Window = {
_ghost: ghost, _ghost: ghost,
_node: props.wrapNode(ghost._node_ghost), _node: props.wrapNode(ghost._node_ghost),
_focused: 0, _focused: 0,
_widgets: [] _widgets: [],
_frame_width: 4,
_title_bar_height: 25,
}; };
m.setInt("content-size[0]", size[0]); m.setInt("content-size[0]", size[0]);
@ -279,6 +281,7 @@ var Window = {
var suffix = me._focused ? "" : "-unfocused"; var suffix = me._focused ? "" : "-unfocused";
me._title_bar_bg.set("fill", style.getColor("title" ~ suffix)); me._title_bar_bg.set("fill", style.getColor("title" ~ suffix));
me._frame.set("stroke", style.getColor("title" ~ suffix));
me._title.set( "fill", style.getColor("title-text" ~ suffix)); me._title.set( "fill", style.getColor("title-text" ~ suffix));
me._top_line.set( "stroke", style.getColor("title-highlight" ~ suffix)); me._top_line.set( "stroke", style.getColor("title-highlight" ~ suffix));
@ -432,6 +435,9 @@ var Window = {
var title_bar = group_deco.createChild("group", "title_bar"); var title_bar = group_deco.createChild("group", "title_bar");
me._title_bar_bg = title_bar.createChild("path"); me._title_bar_bg = title_bar.createChild("path");
me._top_line = title_bar.createChild("path", "top-line"); me._top_line = title_bar.createChild("path", "top-line");
me._frame = title_bar.createChild("path");
me._frame.set("fill", "none");
me._frame.set("stroke-width", me._frame_width);
# close icon # close icon
var x = 10; var x = 10;
@ -467,6 +473,11 @@ var Window = {
var border_radius = 9; var border_radius = 9;
me._title_bar_bg me._title_bar_bg
.reset()
.rect( 0, 0,
me.get("size[0]"), me._title_bar_height,
{"border-top-radius": border_radius} );
me._frame
.reset() .reset()
.rect( 0, 0, .rect( 0, 0,
me.get("size[0]"), me.get("size[1]"), me.get("size[0]"), me.get("size[1]"),