projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix shf-f1/f2 toggle timeline update
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
gwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/gwindowgui.C
b/cinelerra-5.1/cinelerra/gwindowgui.C
index 306bc2ac49e8133322f790b0ede77666d7a01247..d237fc492d272a9f5bfa186e7918f37f0a1a20e8 100644
(file)
--- a/
cinelerra-5.1/cinelerra/gwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/gwindowgui.C
@@
-424,10
+424,15
@@
void GWindowGUI::create_objects()
unlock_window();
}
unlock_window();
}
-void GWindowGUI::update_mwindow()
+void GWindowGUI::update_mwindow(
int toggles, int overlays
)
{
unlock_window();
{
unlock_window();
- mwindow->gui->mainmenu->update_toggles(1);
+ mwindow->gui->lock_window("GWindowGUI::update_mwindow");
+ if( toggles )
+ mwindow->gui->mainmenu->update_toggles(0);
+ if( overlays )
+ mwindow->gui->draw_overlays(1);
+ mwindow->gui->unlock_window();
lock_window("GWindowGUI::update_mwindow");
}
lock_window("GWindowGUI::update_mwindow");
}
@@
-451,7
+456,7
@@
void GWindowGUI::toggle_camera_xyz()
camera_xyz->set_value(v);
xyz_check(AUTOMATION_CAMERA_X, v);
update_toggles(0);
camera_xyz->set_value(v);
xyz_check(AUTOMATION_CAMERA_X, v);
update_toggles(0);
- update_mwindow();
+ update_mwindow(
1, 1
);
}
void GWindowGUI::toggle_projector_xyz()
}
void GWindowGUI::toggle_projector_xyz()
@@
-460,7
+465,7
@@
void GWindowGUI::toggle_projector_xyz()
projector_xyz->set_value(v);
xyz_check(AUTOMATION_PROJECTOR_X, v);
update_toggles(0);
projector_xyz->set_value(v);
xyz_check(AUTOMATION_PROJECTOR_X, v);
update_toggles(0);
- update_mwindow();
+ update_mwindow(
1, 1
);
}
int GWindowGUI::translation_event()
}
int GWindowGUI::translation_event()
@@
-587,7
+592,7
@@
int GWindowToggle::handle_event()
gui->update_toggles(0);
}
}
gui->update_toggles(0);
}
}
- gui->update_mwindow();
+ gui->update_mwindow(
1, 0
);
// Update stuff in MWindow
unlock_window();
// Update stuff in MWindow
unlock_window();