X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcbutton.C;h=6d0c4349da01c57e8e03f8884865e35c7ea0307e;hb=ccd23c15fae578be22d48b1a1e8b09cb43d593ae;hp=90a4681db0ddd6d28750315449cdafeb3dc7cce8;hpb=72a6abf751403bd91464e77ff2cece01c9756a6b;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bcbutton.C b/cinelerra-5.1/guicast/bcbutton.C index 90a4681d..6d0c4349 100644 --- a/cinelerra-5.1/guicast/bcbutton.C +++ b/cinelerra-5.1/guicast/bcbutton.C @@ -23,7 +23,7 @@ #include "bcpixmap.h" #include "bcresources.h" #include "bcsignals.h" -#include "colors.h" +#include "bccolors.h" #include "fonts.h" #include "keys.h" #include "language.h" @@ -105,6 +105,7 @@ int BC_Button::update_bitmaps(VFrame **data) void BC_Button::enable() { enabled = 1; + status = BUTTON_UP; draw_face(); } @@ -154,12 +155,10 @@ int BC_Button::draw_face(int flush) int BC_Button::repeat_event(int64_t duration) { - if( status == BUTTON_UPHI && !tooltip_done && - tooltip_text && tooltip_text[0] != 0 && + if( status == BUTTON_UPHI && tooltip_text && tooltip_text[0] != 0 && duration == top_level->get_resources()->tooltip_delay ) { show_tooltip(); - tooltip_done = 1; return 1; } return 0; @@ -169,9 +168,7 @@ int BC_Button::cursor_enter_event() { if(is_event_win() && enabled) { - tooltip_done = 0; - if(top_level->button_down) - { + if(top_level->button_down) { status = BUTTON_DOWNHI; } else