projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
play_off preview tweak, zoombar auto_color fix, deactivate popupmenu on click while...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
zoombar.C
diff --git
a/cinelerra-5.1/cinelerra/zoombar.C
b/cinelerra-5.1/cinelerra/zoombar.C
index 6ed44a6d1d85d55ff85703c89b878b831e2c96e2..b6fd85214a3b625202e82413410133c4a48e9467 100644
(file)
--- a/
cinelerra-5.1/cinelerra/zoombar.C
+++ b/
cinelerra-5.1/cinelerra/zoombar.C
@@
-440,7
+440,8
@@
int AutoZoom::handle_down_event()
AutoTypeMenu::AutoTypeMenu(MWindow *mwindow, ZoomBar *zoombar, int x, int y, int wid)
AutoTypeMenu::AutoTypeMenu(MWindow *mwindow, ZoomBar *zoombar, int x, int y, int wid)
- : BC_PopupMenu(x, y, wid, to_text(mwindow->edl->local_session->zoombar_showautotype), 1)
+ : BC_PopupMenu(x, y, wid + 24,
+ to_text(mwindow->edl->local_session->zoombar_showautotype), 1, 0, 12)
{
this->mwindow = mwindow;
this->zoombar = zoombar;
{
this->mwindow = mwindow;
this->zoombar = zoombar;
@@
-481,14
+482,14
@@
int AutoTypeMenu::from_text(char *text)
return AUTOGROUPTYPE_INT255;
}
return AUTOGROUPTYPE_INT255;
}
-int AutoTypeMenu::draw_face(int dx)
+int AutoTypeMenu::draw_face(int dx
, int color
)
{
{
- BC_PopupMenu::draw_face(dx);
-
int
color = mwindow->edl->local_session->zoombar_showautocolor;
+ BC_PopupMenu::draw_face(dx
+8, color
);
+ color = mwindow->edl->local_session->zoombar_showautocolor;
if( color >= 0 ) {
set_color(color);
int margin = get_margin();
if( color >= 0 ) {
set_color(color);
int margin = get_margin();
- int mx = margin+
5
, my = 3*margin/8;
+ int mx = margin+
4
, my = 3*margin/8;
int bh = get_h() - 2*my;
draw_box(mx,my, bh,bh);
}
int bh = get_h() - 2*my;
draw_box(mx,my, bh,bh);
}