X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowdraw.C;h=52b7f83727a4cbfce049250ba9c91a43aafd1c9a;hb=4f7f413cbc1c6ea5da27cb75ca27a3ab317243ec;hp=3119cde12cf4b803f6333f19812809b2e5a5561a;hpb=fe4662624d711faab6b406490a64c2382661997e;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bcwindowdraw.C b/cinelerra-5.1/guicast/bcwindowdraw.C index 3119cde1..52b7f837 100644 --- a/cinelerra-5.1/guicast/bcwindowdraw.C +++ b/cinelerra-5.1/guicast/bcwindowdraw.C @@ -216,7 +216,7 @@ void BC_WindowBase::draw_utf8_text(int x, int y, } } -void BC_WindowBase::draw_xft_text(int x, int y, +void BC_WindowBase::draw_xft_text(int x, int y, const char *text, int length, BC_Pixmap *pixmap, int is_utf8) { int l = length + 1; @@ -1117,9 +1117,11 @@ void BC_WindowBase::draw_vframe(VFrame *frame, 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); @@ -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_text); + text); } }