}
}
+ int64_t track_x, track_y, track_w, track_h;
+ track_dimensions(current,
+ track_x, track_y, track_w, track_h);
+ set_color((~get_resources()->get_bg_color()) & 0xffffff);
+ set_opaque();
+ int x1 = track_x, x2 = x1+track_w;
+ int y1 = track_y+track_h-1;
+ draw_line(x1,y1, x2,y1, background_pixmap);
}
if (x + w <= 0)
{
- draw_triangle_left(0, y + h /6, h * 2/3, h * 2/3, BLACK, GREEN, YELLOW, RED, BLUE);
+ draw_triangle_left(0, y + h /6,
+ h * 2/3, h * 2/3, BLACK, GREEN, YELLOW, RED, BLUE);
return;
} else
if (x >= get_w())
{
- draw_triangle_right(get_w() - h * 2/3, y + h /6, h * 2/3, h * 2/3, BLACK, GREEN, YELLOW, RED, BLUE);
+ draw_triangle_right(get_w() - h * 2/3, y + h /6,
+ h * 2/3, h * 2/3, BLACK, GREEN, YELLOW, RED, BLUE);
return;
}
// Fix bug in heroines & cvs version as of 22.8.2005:
// If we grab when zoomed in and zoom out while dragging, when edit gets really narrow strange things start happening
if (w >= 0 && w < 3) {x -= w /2; w = 3;};
- if(x < -10)
- {
- w += x - -10;
- x = -10;
- }
-
- if(y < -10)
- {
- h += y - -10;
- y = -10;
- }
+ if(x < -10) { w += x - -10; x = -10; }
+ if(y < -10) { h += y - -10; y = -10; }
w = MIN(w, get_w() + 20);
h = MIN(h, get_h() + 20);
// Fix bug in heroines & cvs version as of 22.8.2005:
// If we grab when zoomed in and zoom out while dragging, when edit gets really narrow strange things start happening
if (w >= 0 && w < 3) {x -= w /2; w = 3;};
- if(x < -10)
- {
- w += x - -10;
- x = -10;
- }
- if(y < -10)
- {
- h += y - -10;
- y = -10;
- }
+ if(x < -10) { w += x - -10; x = -10; }
+ if(y < -10) { h += y - -10; y = -10; }
w = MIN(w, get_w() + 20);
h = MIN(h, get_h() + 20);
set_color(mwindow->preferences->highlight_inverse);
void TrackCanvas::get_transition_coords(Edit *edit,
int64_t &x, int64_t &y, int64_t &w, int64_t &h)
{
- int transition_w = 30, transition_h = 30;
+ int transition_w = xS(30), transition_h = yS(30);
int has_titles = edit->track->show_titles();
int has_assets = edit->track->show_assets();
double title_bg_h = mwindow->theme->get_image("title_bg_data")->get_h();
toggle_x = MIN(get_w() - right_margin, toggle_x);
// On toggle
- toggle_x -= PluginOn::calculate_w(mwindow) + 10;
+ toggle_x -= PluginOn::calculate_w(mwindow) + xS(10);
if(toggle_x > min_x)
{
if(current_on >= plugin_on_toggles.total)
if(plugin->plugin_type == PLUGIN_STANDALONE)
{
// Show
- toggle_x -= PluginShow::calculate_w(mwindow) + 10;
+ toggle_x -= PluginShow::calculate_w(mwindow) + xS(10);
if(toggle_x > min_x)
{
if(current_show >= plugin_show_toggles.total)
}
current_show++;
}
- toggle_x -= PluginPresetEdit::calculate_w(mwindow) + 10;
+ toggle_x -= PluginPresetEdit::calculate_w(mwindow) + xS(10);
if(toggle_x > min_x)
{
if(current_preset >= preset_edit_buttons.total)
void TrackCanvas::draw_hard_edges()
{
+ if( !mwindow->edl->session->auto_conf->hard_edges )
+ return;
int64_t x, y, w, h;
for(Track *track = mwindow->edl->tracks->first; track; track = track->next) {
edit_dimensions(edit, x, y, w, h);
if( y+h < 0 || y >= get_h() ) continue;
int edge_x = !drag_handle ? x : x + w;
- int edge_y = y + h/2, k = 10;
+ int edge_y = y + h/2, xs10 = xS(10), ys10 = yS(10);
if( edge_x >= 0 && edge_x < get_w() ) {
if( !can_drag ) {
- draw_line(edge_x-k,edge_y-k, edge_x+k,edge_y+k);
- draw_line(edge_x-k,edge_y+k, edge_x+k,edge_y-k);
+ draw_line(edge_x-xs10,edge_y-ys10, edge_x+xs10,edge_y+ys10);
+ draw_line(edge_x-xs10,edge_y+ys10, edge_x+xs10,edge_y-ys10);
}
else if( !drag_handle ) {
- draw_line(edge_x+k,edge_y-k, edge_x,edge_y);
- draw_line(edge_x+k,edge_y+k, edge_x,edge_y);
+ draw_line(edge_x+xs10,edge_y-ys10, edge_x,edge_y);
+ draw_line(edge_x+xs10,edge_y+ys10, edge_x,edge_y);
}
else {
- draw_line(edge_x,edge_y, edge_x-k,edge_y-k);
- draw_line(edge_x,edge_y, edge_x-k,edge_y+k);
+ draw_line(edge_x,edge_y, edge_x-xs10,edge_y-ys10);
+ draw_line(edge_x,edge_y, edge_x-xs10,edge_y+ys10);
}
}
edge_x += delta;
pankeyframe_pixmap,
modekeyframe_pixmap,
maskkeyframe_pixmap,
+ 0,
};
CLAMP(y1, ymin, ymax);
CLAMP(y2, ymin, ymax);
- if(y2 - 1 > y1)
- {
- set_color(BLACK);
- draw_box(x1 + 1, y1 + 1, x2 - x1, y2 - y1);
- set_color(color);
- draw_box(x1, y1, x2 - x1, y2 - y1);
+ if( y2-1 > y1 ) {
+ if( current->curve_mode == FloatAuto::LINEAR ) {
+ draw_box(x1, y1, x2 - x1, y2 - y1);
+ }
+ else {
+ ArrayList<int> polygon_x;
+ ArrayList<int> polygon_y;
+ polygon_x.append((x1 + x2) / 2 + 1);
+ polygon_y.append(y1 + 1);
+ polygon_x.append(x2 + 1);
+ polygon_y.append((y1 + y2) / 2 + 1);
+ polygon_x.append((x1 + x2) / 2 + 1);
+ polygon_y.append(y2 + 1);
+ polygon_x.append(x1 + 1);
+ polygon_y.append((y1 + y2) / 2 + 1);
+ fill_polygon(&polygon_x, &polygon_y);
+ }
}
// show bezier control points (only) if this
set_color(color);
draw_line(ax, 0, ax, get_h());
+ char text[BCSTRLEN];
if( show ) {
- char text[BCSTRLEN];
if( auto_keyframe->is_floatauto() ) {
FloatAuto *float_auto = (FloatAuto *)auto_keyframe;
sprintf(text, "%0.2f", float_auto->get_value());
}
- else {
+ else if( auto_keyframe->is_intauto() ) {
IntAuto *int_auto = (IntAuto *)auto_keyframe;
sprintf(text, "%d", int_auto->value);
}
+ else
+ show = 0;
+ }
+ if( show ) {
int font = MEDIUMFONT;
- int tw = get_text_width(font, text) + TOOLTIP_MARGIN * 2;
- int th = get_text_height(font, text) + TOOLTIP_MARGIN * 2;
+ int tw = get_text_width(font, text) + xS(TOOLTIP_MARGIN) * 2;
+ int th = get_text_height(font, text) + yS(TOOLTIP_MARGIN) * 2;
set_color(get_resources()->tooltip_bg_color);
ax += HANDLE_W/2;
ay += center_pixel + HANDLE_W/2;
set_color(BLACK);
draw_rectangle(ax, ay, tw, th);
set_font(font);
- ax += TOOLTIP_MARGIN;
- ay += TOOLTIP_MARGIN + get_text_ascent(font);
+ ax += xS(TOOLTIP_MARGIN);
+ ay += yS(TOOLTIP_MARGIN) + get_text_ascent(font);
draw_text(ax, ay, text);
}
return 0;
int new_cursor, update_cursor, rerender;
// Move background pixmap to foreground pixmap
- draw_pixmap(background_pixmap,
- 0,
- 0,
- get_w(),
- get_h(),
- 0,
- 0);
+ draw_pixmap(background_pixmap, 0, 0, get_w(), get_h(), 0, 0);
// In/Out points
draw_inout_points();
delete video_cache;
mwindow->cwindow->gui->lock_window("TrackCanvas::render_handle_frame 0");
Canvas *canvas = mwindow->cwindow->gui->canvas;
- canvas->lock_canvas("TrackCanvas::render_handle_frame 1");
int w = canvas->w, h = canvas->h, w2 = w/2, h2 = h/2;
int lx = 0, ly = h2/2, rx = w2, ry = h2/2;
BC_WindowBase *window = canvas->get_canvas();
window->draw_vframe(&vlt, lx,ly, w2,h2, 0,0,vlt.get_w(),vlt.get_h());
window->draw_vframe(&vrt, rx,ry, w2,h2, 0,0,vrt.get_w(),vrt.get_h());
window->flash(1);
- canvas->unlock_canvas();
mwindow->cwindow->gui->unlock_window();
break; }
case 1:
update_overlay = 1;
}
}
- else if( result < 0 ) {
+ else if( result < 0 && !edit_result->silence() ) {
mwindow->undo->update_undo_before();
if( !shift_down() ) {
if( handle_result == 0 )
mwindow->session->drag_group->remove_user();
double start_position = 0;
mwindow->session->drag_group =
- mwindow->selected_edits_to_clip(0, &start_position,
- &mwindow->session->drag_group_first_track,
- mwindow->edl->session->labels_follow_edits,
- mwindow->edl->session->autos_follow_edits,
- mwindow->edl->session->plugins_follow_edits);
+ mwindow->edl->selected_edits_to_clip(0, &start_position,
+ &mwindow->session->drag_group_first_track);
if( mwindow->session->drag_group ) {
mwindow->session->current_operation = DRAG_GROUP;
mwindow->session->drag_group_position = start_position;
projects / goodguy / cinelerra.git / blobdiff