X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fchannelinfo.C;h=b96be4f354bd539577d375e2044c1f715ded1863;hb=4d515bb7ba93b462bc7871b38cdceec988c1e733;hp=21e5049aab63f7e5ef45da2ce3f402952f717c48;hpb=235c9cc4df8306babbbfda46189108fe262d44ef;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/channelinfo.C b/cinelerra-5.1/cinelerra/channelinfo.C
index 21e5049a..b96be4f3 100644
--- a/cinelerra-5.1/cinelerra/channelinfo.C
+++ b/cinelerra-5.1/cinelerra/channelinfo.C
@@ -142,7 +142,7 @@ int ChanSearchMatchCase::handle_event()
 
 
 ChanSearchText::ChanSearchText(ChanSearchGUI *gui, int x, int y, int w)
- : BC_TextBox(x, y, w, 1, "") 
+ : BC_TextBox(x, y, w, 1, "")
 {
 	this->gui = gui;
 }
@@ -346,7 +346,7 @@ ChanSearchGUI::ChanSearchGUI(ChanSearch *cswindow)
 
 ChanSearchGUI::~ChanSearchGUI()
 {
-	
+
 	ChannelEvent *item = highlighted_event;
 	if( item ) {
 		panel->lock_window("ChanSearchGUI::~ChanSearchGUI");
@@ -628,7 +628,6 @@ ChannelDataItem::ChannelDataItem(ChannelPanel *panel, int x, int y, int w,
 {
 	this->panel = panel;
 	x0 = x;  y0 = y;
-	in_window = tooltip_done = 0;
 	tip_info = 0;
 	set_force_tooltip(1);
 }
@@ -638,25 +637,11 @@ ChannelDataItem::~ChannelDataItem()
 	delete [] tip_info;
 }
 
-int ChannelDataItem::cursor_enter_event()
-{
-	if( is_event_win() ) { in_window = 1; tooltip_done = 0; }
-	else in_window = 0;
-	return 0;
-}
-
-int ChannelDataItem::cursor_leave_event()
-{
-	if( tooltip_done ) { hide_tooltip(); in_window = 0; }
-	return 0;
-}
-
 int ChannelDataItem::repeat_event(int64_t duration)
 {
-	if( !tooltip_done && tip_info && in_window &&
+	if( tip_info && cursor_above() &&
 		duration == get_resources()->tooltip_delay ) {
 		show_tooltip();
-		tooltip_done = 1;
 		return 1;
 	}
 	return 0;
@@ -959,7 +944,7 @@ void ChannelPanel::get_xtime(int x, char *cp)
 	struct tm xtm;  localtime_r(&xt,&xtm);
 	cp += sprintf(cp,"%02d:%02d",xtm.tm_hour, xtm.tm_min);
 	if( !xtm.tm_hour && !xtm.tm_min ) {
-		sprintf(cp,_("(%3.3s) "),&_("sunmontuewedthufrisat")[xtm.tm_wday*3]);
+		sprintf(cp,"(%3.3s) ",&_("sunmontuewedthufrisat")[xtm.tm_wday*3]);
 	}
 }
 
@@ -1061,7 +1046,7 @@ ChannelThread::ChannelThread(ChannelInfoGUI *gui)
 	this->gui = gui;
 	this->iwindow = gui->iwindow;
 	this->panel = gui->panel;
-	
+
 	fd = 0;
 	done = 0;
 }