projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ffmpeg raw pcm audio, pcm probe fixes
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcmenupopup.C
diff --git
a/cinelerra-5.1/guicast/bcmenupopup.C
b/cinelerra-5.1/guicast/bcmenupopup.C
index 1888e6cfdf514dfe9562bb0c5358dea8cd9a0917..c47e699a4be00cb8fe89bb555231568271605bb7 100644
(file)
--- a/
cinelerra-5.1/guicast/bcmenupopup.C
+++ b/
cinelerra-5.1/guicast/bcmenupopup.C
@@
-89,7
+89,7
@@
int BC_MenuPopup::initialize(BC_WindowBase *top_level,
{
window_bg = new BC_Pixmap(top_level, resources->menu_popup_bg);
}
{
window_bg = new BC_Pixmap(top_level, resources->menu_popup_bg);
}
-
+
if(resources->menu_item_bg)
{
item_bg[0] = new BC_Pixmap(top_level, resources->menu_item_bg[0], PIXMAP_ALPHA);
if(resources->menu_item_bg)
{
item_bg[0] = new BC_Pixmap(top_level, resources->menu_item_bg[0], PIXMAP_ALPHA);
@@
-428,7
+428,13
@@
BC_Popup* BC_MenuPopup::get_popup()
int BC_MenuPopup::cursor_inside()
{
int BC_MenuPopup::cursor_inside()
{
- return !popup || !popup->cursor_above() ? 0 : 1;
+ if( !popup ) return 0;
+ if( popup->cursor_above() ) return 1;
+ for( int i=0; i<menu_items.size(); ++i ) {
+ if( !menu_items[i]->submenu ) continue;
+ if( menu_items[i]->submenu->cursor_inside() ) return 1;
+ }
+ return 0;
}
int BC_MenuPopup::get_w()
}
int BC_MenuPopup::get_w()