projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
igor ru.po
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bclistbox.C
diff --git
a/cinelerra-5.1/guicast/bclistbox.C
b/cinelerra-5.1/guicast/bclistbox.C
index 7a521a310d2244edfcd69bf17975ff57c7909ed8..88d4b09470a8337a470f11f664f26b9e7edbf945 100644
(file)
--- a/
cinelerra-5.1/guicast/bclistbox.C
+++ b/
cinelerra-5.1/guicast/bclistbox.C
@@
-3979,6
+3979,7
@@
int BC_ListBox::deactivate()
int BC_ListBox::activate(int take_focus)
{
if( active ) return 0;
int BC_ListBox::activate(int take_focus)
{
if( active ) return 0;
+ active = 1;
if( take_focus )
set_active_subwindow(this);
button_releases = 0;
if( take_focus )
set_active_subwindow(this);
button_releases = 0;
@@
-3997,11
+3998,11
@@
int BC_ListBox::activate(int take_focus)
int BC_ListBox::activate(int x, int y, int w, int h)
{
int BC_ListBox::activate(int x, int y, int w, int h)
{
- if( active || !is_popup || gui ) return 0;
+ if( !is_popup || gui ) return 0;
+ active = 1;
if(w != -1) popup_w = w;
if(h != -1) popup_h = h;
reset_query();
if(w != -1) popup_w = w;
if(h != -1) popup_h = h;
reset_query();
- active = 1;
if( y + popup_h > top_level->get_root_h(0) )
y -= get_h() + popup_h;
add_subwindow(gui = new BC_Popup(this,
if( y + popup_h > top_level->get_root_h(0) )
y -= get_h() + popup_h;
add_subwindow(gui = new BC_Popup(this,