X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fchannelinfo.C;h=b96be4f354bd539577d375e2044c1f715ded1863;hb=b78e8ac7987fbf35a4ba60534c4a3d2b290562b9;hp=7bcac18863e4bf243dbd0d672b8726e43f8a4fdb;hpb=0b78779e9e75131eee81d2e4689b98df0e91c092;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/channelinfo.C b/cinelerra-5.1/cinelerra/channelinfo.C index 7bcac188..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; @@ -1061,7 +1046,7 @@ ChannelThread::ChannelThread(ChannelInfoGUI *gui) this->gui = gui; this->iwindow = gui->iwindow; this->panel = gui->panel; - + fd = 0; done = 0; }