From 99e0a7c70a0185aaa75c751a2126e74dc974ed46 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Wed, 29 Jun 2016 14:11:24 -0600 Subject: [PATCH] fixes to mask, keyfrmpopup, listbox; update ver for build --- cinelerra-5.1/PKGBUILD | 2 +- cinelerra-5.1/bld_scripts/pkgbld.sh | 2 ++ cinelerra-5.1/cinelerra.spec | 2 +- cinelerra-5.1/cinelerra/cwindowgui.C | 11 ++++++----- cinelerra-5.1/cinelerra/keyframepopup.C | 4 +++- cinelerra-5.1/debian/changelog | 6 ++++++ cinelerra-5.1/debian/control | 2 +- cinelerra-5.1/guicast/bclistbox.C | 3 +-- 8 files changed, 21 insertions(+), 11 deletions(-) create mode 100755 cinelerra-5.1/bld_scripts/pkgbld.sh diff --git a/cinelerra-5.1/PKGBUILD b/cinelerra-5.1/PKGBUILD index adaa8047..ac15f1cd 100644 --- a/cinelerra-5.1/PKGBUILD +++ b/cinelerra-5.1/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy pkgname=cin pkgver=5.1 -pkgrel=20160619 +pkgrel=20160628 pkgdesc="Cinelerra git://git.cinelerra-cv.org/goodguy/cinelerra.git ($pkgrel)" arch=('x86_64') url="http://www.cinelerra-cv.org" diff --git a/cinelerra-5.1/bld_scripts/pkgbld.sh b/cinelerra-5.1/bld_scripts/pkgbld.sh new file mode 100755 index 00000000..5c545f5f --- /dev/null +++ b/cinelerra-5.1/bld_scripts/pkgbld.sh @@ -0,0 +1,2 @@ +#!/bin/bash +makepkg diff --git a/cinelerra-5.1/cinelerra.spec b/cinelerra-5.1/cinelerra.spec index 0dce39b3..0ca8b5e3 100644 --- a/cinelerra-5.1/cinelerra.spec +++ b/cinelerra-5.1/cinelerra.spec @@ -1,4 +1,4 @@ -%define ver 20160606 +%define ver 20160628 Summary: Multimedia Editing and construction Name: cinelerra Version: 5.1 diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C index aa61b3e1..113a8cda 100644 --- a/cinelerra-5.1/cinelerra/cwindowgui.C +++ b/cinelerra-5.1/cinelerra/cwindowgui.C @@ -1584,6 +1584,7 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender, } else { if(!gui->shift_down()) { + output_to_canvas(mwindow->edl, 0, canvas_x0, canvas_y0); if(test_bbox(cursor_x, cursor_y, canvas_x0, canvas_y0)) { selected_point = i; } @@ -1605,6 +1606,7 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender, } else if(i < points.size() - 1) { if(!gui->shift_down()) { + output_to_canvas(mwindow->edl, 0, canvas_x3, canvas_y3); if(test_bbox(cursor_x, cursor_y, canvas_x3, canvas_y3)) { selected_point = (i < points.size() - 1 ? i + 1 : 0); } @@ -1641,15 +1643,14 @@ int CWindowCanvas::do_mask(int &redraw, int &rerender, // sprintf(string, "%d", (i < points.size() - 1 ? i + 1 : 0)); // canvas->draw_text((int)canvas_x + CONTROL_W, (int)canvas_y + CONTROL_W, string); } - -// Draw second control point. Discard x2 and y2 after this. - output_to_canvas(mwindow->edl, 0, x2, y2); +// Draw second control point. + output_to_canvas(mwindow->edl, 0, canvas_x2, canvas_y2); get_canvas()->draw_line( (int)canvas_x, (int)canvas_y, (int)canvas_x2, (int)canvas_y2); get_canvas()->draw_rectangle( - (int)x2 - CONTROL_W / 2, - (int)y2 - CONTROL_H / 2, + (int)canvas_x2 - CONTROL_W / 2, + (int)canvas_y2 - CONTROL_H / 2, CONTROL_W, CONTROL_H); } } diff --git a/cinelerra-5.1/cinelerra/keyframepopup.C b/cinelerra-5.1/cinelerra/keyframepopup.C index 45fdb127..13f2af0d 100644 --- a/cinelerra-5.1/cinelerra/keyframepopup.C +++ b/cinelerra-5.1/cinelerra/keyframepopup.C @@ -127,12 +127,13 @@ void KeyframePopup::handle_curve_mode(Autos *autos, Auto *auto_keyframe) // determines the type of automation node. if floatauto, adds // menu entries showing the curve mode of the node { + deactivate(); if( !key_edit_displayed && keyframe_plugin ) { add_item(key_edit); key_edit_displayed = true; } else if( key_edit_displayed && !keyframe_plugin ) { - remove_item(key_mbar); + remove_item(key_edit); key_edit_displayed = false; } @@ -161,6 +162,7 @@ void KeyframePopup::handle_curve_mode(Autos *autos, Auto *auto_keyframe) key_free_t->toggle_mode((FloatAuto*)auto_keyframe); key_free ->toggle_mode((FloatAuto*)auto_keyframe); } + activate(); } KeyframePopupDelete::KeyframePopupDelete(MWindow *mwindow, KeyframePopup *popup) diff --git a/cinelerra-5.1/debian/changelog b/cinelerra-5.1/debian/changelog index 08b9df6d..41f2b2be 100644 --- a/cinelerra-5.1/debian/changelog +++ b/cinelerra-5.1/debian/changelog @@ -1,3 +1,9 @@ +cin (1:5.1.20160628) unstable; urgency=low + + [ guy goode ] + + -- lists Mon, 6 Jun 2016 18:39:04 +0700 + cin (1:5.1.20160606) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/debian/control b/cinelerra-5.1/debian/control index fdbc5b12..bb52c915 100644 --- a/cinelerra-5.1/debian/control +++ b/cinelerra-5.1/debian/control @@ -1,7 +1,7 @@ Source: cin Section: video Priority: optional -Standards-Version: 5.1.20160606 +Standards-Version: 5.1.20160628 Maintainer: mailing list Homepage: http://www.cinelerra-cv.org/ Build-Depends: nasm, yasm, g++, gdb, build-essential, e2fsprogs, diff --git a/cinelerra-5.1/guicast/bclistbox.C b/cinelerra-5.1/guicast/bclistbox.C index 6468b89f..683985fe 100644 --- a/cinelerra-5.1/guicast/bclistbox.C +++ b/cinelerra-5.1/guicast/bclistbox.C @@ -2419,9 +2419,8 @@ int BC_ListBox::get_cursor_item(ArrayList *data, } } } - else + else if( gui ) { // Text is treed - { // Cursor is inside items rectangle if(cursor_x >= 0 && cursor_x < (yscrollbar ? -- 2.26.2