X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedithandles.C;h=41d421c9d7d1213d9a6fb60711d9f0e8dca82b90;hp=3ce57cad73efa6d682dec8c582116bd90faf6522;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d diff --git a/cinelerra-5.1/cinelerra/edithandles.C b/cinelerra-5.1/cinelerra/edithandles.C index 3ce57cad..41d421c9 100644 --- a/cinelerra-5.1/cinelerra/edithandles.C +++ b/cinelerra-5.1/cinelerra/edithandles.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "cursors.h" @@ -33,17 +33,17 @@ -EditHandle::EditHandle(MWindow *mwindow, - TrackCanvas *trackcanvas, - Edit *edit, - int side, - int x, +EditHandle::EditHandle(MWindow *mwindow, + TrackCanvas *trackcanvas, + Edit *edit, + int side, + int x, int y) : CanvasTool(mwindow, trackcanvas, - edit, + edit, x, - y, + y, side == EDIT_IN ? mwindow->theme->edithandlein_data : mwindow->theme->edithandleout_data) { this->side = side; @@ -62,16 +62,16 @@ int EditHandle::handle_event() -EditHandleIn::EditHandleIn(MWindow *mwindow, +EditHandleIn::EditHandleIn(MWindow *mwindow, TrackCanvas *trackcanvas, Edit *edit, int x, int y) - : EditHandle(mwindow, - trackcanvas, - edit, - EDIT_IN, - x, + : EditHandle(mwindow, + trackcanvas, + edit, + EDIT_IN, + x, y) { } @@ -93,16 +93,16 @@ int EditHandleIn::handle_event() -EditHandleOut::EditHandleOut(MWindow *mwindow, +EditHandleOut::EditHandleOut(MWindow *mwindow, TrackCanvas *trackcanvas, Edit *edit, int x, int y) - : EditHandle(mwindow, - trackcanvas, - edit, - EDIT_OUT, - x, + : EditHandle(mwindow, + trackcanvas, + edit, + EDIT_OUT, + x, y) { this->mwindow = mwindow; @@ -130,7 +130,7 @@ int EditHandleOut::handle_event() -EditHandles::EditHandles(MWindow *mwindow, +EditHandles::EditHandles(MWindow *mwindow, TrackCanvas *trackcanvas) : CanvasTools(mwindow, trackcanvas) { @@ -157,7 +157,7 @@ void EditHandles::update() if(visible(handle_x, handle_y, handle_w, handle_h)) { int exists = 0; - + for(int i = 0; i < total; i++) { EditHandle *handle = (EditHandle*)values[i]; @@ -171,14 +171,14 @@ void EditHandles::update() break; } } - + if(!exists) { - EditHandle *handle = new EditHandle(mwindow, - trackcanvas, - edit, - EDIT_IN, - handle_x, + EditHandle *handle = new EditHandle(mwindow, + trackcanvas, + edit, + EDIT_IN, + handle_x, handle_y); trackcanvas->add_subwindow(handle); handle->set_cursor(ARROW_CURSOR, 0, 0); @@ -193,7 +193,7 @@ void EditHandles::update() if(visible(handle_x, handle_y, handle_w, handle_h)) { int exists = 0; - + for(int i = 0; i < total; i++) { EditHandle *handle = (EditHandle*)values[i]; @@ -207,14 +207,14 @@ void EditHandles::update() break; } } - + if(!exists) { - EditHandle *handle = new EditHandle(mwindow, - trackcanvas, - edit, - EDIT_OUT, - handle_x, + EditHandle *handle = new EditHandle(mwindow, + trackcanvas, + edit, + EDIT_OUT, + handle_x, handle_y); trackcanvas->add_subwindow(handle); handle->set_cursor(ARROW_CURSOR, 0, 0);