X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenderer_dragbox.cpp;h=a1771547f29053736a50d7138770f1dc71fea71a;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=c077dfce25614e36abae01c6aca0d70355d076d1;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp b/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp index c077dfc..a177154 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ -/*! \file template.cpp +/* === S Y N F I G ========================================================= */ +/*! \file renderer_dragbox.cpp ** \brief Template File ** -** $Id: renderer_dragbox.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package 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. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package 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. ** \endlegal */ /* ========================================================================= */ @@ -32,13 +33,15 @@ #include "workarea.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -53,13 +56,13 @@ Renderer_Dragbox::~Renderer_Dragbox() { } -const sinfg::Point& +const synfig::Point& Renderer_Dragbox::get_drag_point()const { return get_work_area()->get_drag_point(); } -const sinfg::Point& +const synfig::Point& Renderer_Dragbox::get_curr_point()const { return get_work_area()->get_cursor_pos(); @@ -75,54 +78,54 @@ Renderer_Dragbox::get_enabled_vfunc()const void Renderer_Dragbox::render_vfunc( const Glib::RefPtr& drawable, - const Gdk::Rectangle& expose_area + const Gdk::Rectangle& /*expose_area*/ ) { assert(get_work_area()); if(!get_work_area()) return; - - const sinfg::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc()); - - const sinfg::Vector focus_point(get_work_area()->get_focus_point()); + + // const synfig::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc()); + + const synfig::Vector focus_point(get_work_area()->get_focus_point()); // std::vector< std::pair,int> >& tile_book(get_tile_book()); - + int drawable_w,drawable_h; drawable->get_size(drawable_w,drawable_h); - + // Calculate the window coordinates of the top-left // corner of the canvas. - const sinfg::Vector::value_type - x(focus_point[0]/get_pw()+drawable_w/2-get_w()/2), - y(focus_point[1]/get_ph()+drawable_h/2-get_h()/2); - - /*const sinfg::Vector::value_type window_startx(window_tl[0]); - const sinfg::Vector::value_type window_endx(window_br[0]); - const sinfg::Vector::value_type window_starty(window_tl[1]); - const sinfg::Vector::value_type window_endy(window_br[1]); + // const synfig::Vector::value_type + // x(focus_point[0]/get_pw()+drawable_w/2-get_w()/2), + // y(focus_point[1]/get_ph()+drawable_h/2-get_h()/2); + + /*const synfig::Vector::value_type window_startx(window_tl[0]); + const synfig::Vector::value_type window_endx(window_br[0]); + const synfig::Vector::value_type window_starty(window_tl[1]); + const synfig::Vector::value_type window_endy(window_br[1]); */ - const int - tile_w(get_work_area()->get_tile_w()), - tile_h(get_work_area()->get_tile_h()); - - const int - w(get_w()), - h(get_h()); - + // const int + // tile_w(get_work_area()->get_tile_w()), + // tile_h(get_work_area()->get_tile_h()); + + // const int + // w(get_w()), + // h(get_h()); + Glib::RefPtr gc(Gdk::GC::create(drawable)); - - //const sinfg::Vector grid_size(get_grid_size()); - const sinfg::Vector::value_type window_startx(get_work_area()->get_window_tl()[0]); - const sinfg::Vector::value_type window_endx(get_work_area()->get_window_br()[0]); - const sinfg::Vector::value_type window_starty(get_work_area()->get_window_tl()[1]); - const sinfg::Vector::value_type window_endy(get_work_area()->get_window_br()[1]); + //const synfig::Vector grid_size(get_grid_size()); + + const synfig::Vector::value_type window_startx(get_work_area()->get_window_tl()[0]); + // const synfig::Vector::value_type window_endx(get_work_area()->get_window_br()[0]); + const synfig::Vector::value_type window_starty(get_work_area()->get_window_tl()[1]); + // const synfig::Vector::value_type window_endy(get_work_area()->get_window_br()[1]); const float pw(get_pw()),ph(get_ph()); - - const sinfg::Point& curr_point(get_curr_point()); - const sinfg::Point& drag_point(get_drag_point()); - + + const synfig::Point& curr_point(get_curr_point()); + const synfig::Point& drag_point(get_drag_point()); + { gc->set_function(Gdk::COPY); gc->set_rgb_fg_color(Gdk::Color("#000000")); @@ -140,7 +143,7 @@ Renderer_Dragbox::render_vfunc( swap(tl[0],br[0]); if(tl[1]>br[1]) swap(tl[1],br[1]); - + drawable->draw_rectangle(gc,false, round_to_int(tl[0]), round_to_int(tl[1]),