projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
titler fixes, auto paste bug, resize popup hang, focus policy fix, chk lang
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcwindowdraw.C
diff --git
a/cinelerra-5.1/guicast/bcwindowdraw.C
b/cinelerra-5.1/guicast/bcwindowdraw.C
index e95b040260e2b7bb1e7927021697bd070e9e6dfe..52b7f83727a4cbfce049250ba9c91a43aafd1c9a 100644
(file)
--- a/
cinelerra-5.1/guicast/bcwindowdraw.C
+++ b/
cinelerra-5.1/guicast/bcwindowdraw.C
@@
-1117,9
+1117,11
@@
void BC_WindowBase::draw_vframe(VFrame *frame,
pixmap);
}
pixmap);
}
-void BC_WindowBase::draw_tooltip()
+void BC_WindowBase::draw_tooltip(
const char *text
)
{
{
- if(tooltip_popup && tooltip_text)
+ if( !text )
+ text = tooltip_text;
+ if(tooltip_popup && text)
{
int w = tooltip_popup->get_w(), h = tooltip_popup->get_h();
tooltip_popup->set_color(get_resources()->tooltip_bg_color);
{
int w = tooltip_popup->get_w(), h = tooltip_popup->get_h();
tooltip_popup->set_color(get_resources()->tooltip_bg_color);
@@
-1129,7
+1131,7
@@
void BC_WindowBase::draw_tooltip()
tooltip_popup->set_font(MEDIUMFONT);
tooltip_popup->draw_text(TOOLTIP_MARGIN,
get_text_ascent(MEDIUMFONT) + TOOLTIP_MARGIN,
tooltip_popup->set_font(MEDIUMFONT);
tooltip_popup->draw_text(TOOLTIP_MARGIN,
get_text_ascent(MEDIUMFONT) + TOOLTIP_MARGIN,
- t
ooltip_t
ext);
+ text);
}
}
}
}