X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcdragwindow.C;h=2eab2e17406d8ce4363a077675aeb8ed4a05e37b;hp=b7ec98e23265428484b901100e91d52d3e4c3d36;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hpb=3ec3a9cc6afc6561311686b3ec597ee3c1d80d6f diff --git a/cinelerra-5.1/guicast/bcdragwindow.C b/cinelerra-5.1/guicast/bcdragwindow.C index b7ec98e2..2eab2e17 100644 --- a/cinelerra-5.1/guicast/bcdragwindow.C +++ b/cinelerra-5.1/guicast/bcdragwindow.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 "bcdragwindow.h" @@ -30,12 +30,12 @@ #define DRAG_OFFSET_X 16 #define DRAG_OFFSET_Y 16 -BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, - BC_Pixmap *pixmap /*, - int icon_x, +BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, + BC_Pixmap *pixmap /*, + int icon_x, int icon_y */) - : BC_Popup(parent_window, -// icon_x, + : BC_Popup(parent_window, +// icon_x, // icon_y, parent_window->get_abs_cursor_x(0) + DRAG_OFFSET_X, parent_window->get_abs_cursor_y(0) + DRAG_OFFSET_Y, @@ -60,12 +60,12 @@ BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, } -BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, - VFrame *frame /*, - int icon_x, +BC_DragWindow::BC_DragWindow(BC_WindowBase *parent_window, + VFrame *frame /*, + int icon_x, int icon_y */) - : BC_Popup(parent_window, -// icon_x, + : BC_Popup(parent_window, +// icon_x, // icon_y, parent_window->get_abs_cursor_x(0) + DRAG_OFFSET_X, parent_window->get_abs_cursor_y(0) + DRAG_OFFSET_Y, @@ -98,13 +98,13 @@ int BC_DragWindow::get_init_x(BC_WindowBase *parent_window, int icon_x) { int output_x, temp = 0; Window tempwin; - XTranslateCoordinates(parent_window->top_level->display, - parent_window->win, - parent_window->top_level->rootwin, - icon_x, - temp, - &output_x, - &temp, + XTranslateCoordinates(parent_window->top_level->display, + parent_window->win, + parent_window->top_level->rootwin, + icon_x, + temp, + &output_x, + &temp, &tempwin); return output_x; } @@ -113,22 +113,22 @@ int BC_DragWindow::get_init_y(BC_WindowBase *parent_window, int icon_y) { int output_y, temp = 0; Window tempwin; - XTranslateCoordinates(parent_window->top_level->display, - parent_window->win, - parent_window->top_level->rootwin, - temp, - icon_y, - &temp, - &output_y, + XTranslateCoordinates(parent_window->top_level->display, + parent_window->win, + parent_window->top_level->rootwin, + temp, + icon_y, + &temp, + &output_y, &tempwin); return output_y; } int BC_DragWindow::cursor_motion_event() { - reposition_window(get_abs_cursor_x(0) + icon_offset_x, - get_abs_cursor_y(0) + icon_offset_y, - get_w(), + reposition_window(get_abs_cursor_x(0) + icon_offset_x, + get_abs_cursor_y(0) + icon_offset_y, + get_w(), get_h()); flush(); return 1; @@ -159,9 +159,9 @@ int BC_DragWindow::drag_failure_event() int new_x = end_x + (init_x - end_x) * i / 10; int new_y = end_y + (init_y - end_y) * i / 10; - reposition_window(new_x, - new_y, - get_w(), + reposition_window(new_x, + new_y, + get_w(), get_h()); flush(); usleep(1000); @@ -177,7 +177,7 @@ void BC_DragWindow::set_animation(int value) BC_Pixmap *BC_DragWindow::prepare_frame(VFrame *frame, BC_WindowBase *parent_window) { temp_frame = 0; - + if(frame->get_color_model() == BC_RGBA8888) { temp_frame = new VFrame(*frame); @@ -186,15 +186,15 @@ BC_Pixmap *BC_DragWindow::prepare_frame(VFrame *frame, BC_WindowBase *parent_win { temp_frame = new VFrame; temp_frame->set_use_shm(0); - temp_frame->reallocate(0, + temp_frame->reallocate(0, -1, 0, 0, 0, - frame->get_w(), - frame->get_h(), + frame->get_w(), + frame->get_h(), BC_RGBA8888, - -1); + -1); BC_CModels::transfer(temp_frame->get_rows(), frame->get_rows(), 0, 0, 0, 0, 0, 0,