moved initial values in function default_xxx

git-svn-id: http://tint2.googlecode.com/svn/trunk@423 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-04-18 12:07:36 +00:00
parent a94d75d393
commit c298a39d00
21 changed files with 243 additions and 225 deletions

View File

@@ -34,23 +34,29 @@ void start_show_timeout();
void start_hide_timeout();
void stop_tooltip_timeout();
// give the tooltip some reasonable default values
Tooltip g_tooltip = {
.tooltip_text = 0,
.area = 0,
.panel = 0,
.window = 0,
.show_timeout_msec = 0,
.hide_timeout_msec = 0,
.enabled = False,
.mapped = False,
.paddingx = 0,
.paddingy = 0,
.font_color = { .color={1, 1, 1}, .alpha=1 },
.bg = 0,
.font_desc = 0,
.timeout = 0
};
Tooltip g_tooltip;
void default_tooltip()
{
// give the tooltip some reasonable default values
memset(&g_tooltip, 0, sizeof(Tooltip));
g_tooltip.font_color.color[0] = 1;
g_tooltip.font_color.color[1] = 1;
g_tooltip.font_color.color[2] = 1;
g_tooltip.font_color.alpha = 1;
}
void cleanup_tooltip()
{
stop_tooltip_timeout();
tooltip_hide(0);
tooltip_copy_text(0);
if (g_tooltip.window) XDestroyWindow(server.dsp, g_tooltip.window);
if (g_tooltip.font_desc) pango_font_description_free(g_tooltip.font_desc);
}
void init_tooltip()
{
@@ -69,23 +75,6 @@ void init_tooltip()
}
void cleanup_tooltip()
{
stop_tooltip_timeout();
tooltip_hide(0);
g_tooltip.enabled = False;
tooltip_copy_text(0);
if (g_tooltip.window) {
XDestroyWindow(server.dsp, g_tooltip.window);
g_tooltip.window = 0;
}
if (g_tooltip.font_desc) {
pango_font_description_free(g_tooltip.font_desc);
g_tooltip.font_desc = 0;
}
}
void tooltip_trigger_show(Area* area, Panel* p, int x_root, int y_root)
{
x = x_root;
@@ -215,7 +204,7 @@ void tooltip_update()
c = cairo_create(cs);
Color bc = g_tooltip.bg->back;
Border b = g_tooltip.bg->border;
if (real_transparency) {
if (server.real_transparency) {
clear_pixmap(g_tooltip.window, 0, 0, width, height);
draw_rect(c, b.width, b.width, width-2*b.width, height-2*b.width, b.rounded-b.width/1.571);
cairo_set_source_rgba(c, bc.color[0], bc.color[1], bc.color[2], bc.alpha);
@@ -226,8 +215,10 @@ void tooltip_update()
}
cairo_fill(c);
cairo_set_line_width(c, b.width);
if (real_transparency) draw_rect(c, b.width/2.0, b.width/2.0, width - b.width, height - b.width, b.rounded);
else cairo_rectangle(c, b.width/2.0, b.width/2.0, width-b.width, height-b.width);
if (server.real_transparency)
draw_rect(c, b.width/2.0, b.width/2.0, width - b.width, height - b.width, b.rounded);
else
cairo_rectangle(c, b.width/2.0, b.width/2.0, width-b.width, height-b.width);
cairo_set_source_rgba(c, b.color[0], b.color[1], b.color[2], b.alpha);
cairo_stroke(c);