projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add edit clear submenu/clear hard_edges, fix tessy gl segv, mask toolgui layout,...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
plugins
/
theme_blue_dot
/
bluedottheme.C
diff --git
a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
index fff94e711e36d8a29170bf49e6b4e21d734d6018..49508a9d017e6dc486a22ce15be4542e3cb739aa 100644
(file)
--- a/
cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
+++ b/
cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C
@@
-100,6
+100,7
@@
BlueDotTheme::~BlueDotTheme()
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
delete keyframe_data;
delete maskkeyframe_data;
delete modekeyframe_data;
+ delete hardedge_data;
delete pankeyframe_data;
delete projectorkeyframe_data;
}
delete pankeyframe_data;
delete projectorkeyframe_data;
}
@@
-286,6
+287,12
@@
void BlueDotTheme::initialize()
"generic_dn.png",
"new_ok_images");
"generic_dn.png",
"new_ok_images");
+ new_button("reset.png",
+ "reset_up.png",
+ "reset_hi.png",
+ "reset_dn.png",
+ "reset_button");
+
resources->cancel_images = new_button("cancel.png",
"generic_up.png",
"generic_hi.png",
resources->cancel_images = new_button("cancel.png",
"generic_up.png",
"generic_hi.png",
@@
-541,6
+548,7
@@
void BlueDotTheme::initialize()
new_image("cbuttons_left", "cbuttons_left.png");
new_image("cbuttons_right", "cbuttons_right.png");
new_image("cmeter_bg", "cmeter_bg.png");
new_image("cbuttons_left", "cbuttons_left.png");
new_image("cbuttons_right", "cbuttons_right.png");
new_image("cmeter_bg", "cmeter_bg.png");
+ new_image("cwindow_focus", "cwindow_focus.png");
new_image("vbuttons_left", "vbuttons_left.png");
new_image("vbuttons_right", "vbuttons_right.png");
timebar_view_data = new_image("timebar_view.png");
new_image("vbuttons_left", "vbuttons_left.png");
new_image("vbuttons_right", "vbuttons_right.png");
timebar_view_data = new_image("timebar_view.png");
@@
-681,6
+689,13
@@
void BlueDotTheme::initialize()
"proxy_s_down.png",
"proxy_s_chkdhi.png");
"proxy_s_down.png",
"proxy_s_chkdhi.png");
+ mask_mode_toggle = new_image_set(5,
+ "mask_mode_up.png",
+ "mask_mode_hi.png",
+ "mask_mode_chkd.png",
+ "mask_mode_down.png",
+ "mask_mode_chkdhi.png");
+
shbtn_data = new_image_set(3,
"shbtn_up.png",
"shbtn_hi.png",
shbtn_data = new_image_set(3,
"shbtn_up.png",
"shbtn_hi.png",
@@
-1007,6
+1022,11
@@
void BlueDotTheme::get_mwindow_sizes(MWindowGUI *gui, int w, int h)
mcanvas_w = w;
mcanvas_h = patchbay_h;
//COPIED START
mcanvas_w = w;
mcanvas_h = patchbay_h;
//COPIED START
+ control_pixels = (mcanvas_w * control_pixels) / 1000;
+ pane_w = get_image_set("xpane")[0]->get_w();
+ pane_h = get_image_set("ypane")[0]->get_h();
+ pane_x = mcanvas_x + mcanvas_w;
+ pane_y = mcanvas_y + mcanvas_h;
mhscroll_x = 0;
mhscroll_y = mzoom_y - BC_ScrollBar::get_span(SCROLL_HORIZ);
mhscroll_w = w - BC_ScrollBar::get_span(SCROLL_VERT);
mhscroll_x = 0;
mhscroll_y = mzoom_y - BC_ScrollBar::get_span(SCROLL_HORIZ);
mhscroll_w = w - BC_ScrollBar::get_span(SCROLL_VERT);
@@
-1228,6
+1248,7
@@
void BlueDotTheme::build_overlays()
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
camerakeyframe_data = new VFramePng(get_image_data("camerakeyframe.png"));
maskkeyframe_data = new VFramePng(get_image_data("maskkeyframe.png"));
modekeyframe_data = new VFramePng(get_image_data("modekeyframe.png"));
+ hardedge_data = new VFramePng(get_image_data("hardedge.png"));
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}
pankeyframe_data = new VFramePng(get_image_data("pankeyframe.png"));
projectorkeyframe_data = new VFramePng(get_image_data("projectorkeyframe.png"));
}