X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_zoom.cpp;h=57a252201f2ad596c9f84596fddc75cd93bda14c;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=66b8d4e75c815bf414f55384e033b6327155836a;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp index 66b8d4e..57a2522 100644 --- a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -41,7 +42,6 @@ #include "canvasview.h" #include "workarea.h" #include "app.h" -#include "dialog_tooloptions.h" #include "toolbox.h" #include @@ -74,21 +74,12 @@ class studio::StateZoom_Context : public sigc::trackable bool prev_workarea_layer_status_; - //Toolbox settings - synfigapp::Settings& settings; - - //Toolbox display - Gtk::Table options_table; - public: - void refresh_tool_options(); //to refresh the toolbox - //events Smach::event_result event_stop_handler(const Smach::event& x); Smach::event_result event_refresh_handler(const Smach::event& x); Smach::event_result event_mouse_click_handler(const Smach::event& x); - Smach::event_result event_refresh_tool_options(const Smach::event& x); //constructor destructor StateZoom_Context(CanvasView* canvas_view); @@ -100,14 +91,9 @@ public: synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();} WorkArea * get_work_area()const{return canvas_view_->get_work_area();} - //Modifying settings etc. - void load_settings(); - void save_settings(); - void reset(); - //void zoom(const Point& p1, const Point& p2); -}; // END of class StateGradient_Context +}; // END of class StateZoom_Context /* === M E T H O D S ======================================================= */ @@ -121,53 +107,17 @@ StateZoom::StateZoom(): insert(event_def(EVENT_WORKAREA_BOX,&StateZoom_Context::event_mouse_click_handler)); //insert(event_def(EVENT_WORKAREA_BUTTON_CLICK,&StateZoom_Context::event_mouse_click_handler)); insert(event_def(EVENT_WORKAREA_MOUSE_BUTTON_UP,&StateZoom_Context::event_mouse_click_handler)); - insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateZoom_Context::event_refresh_tool_options)); } StateZoom::~StateZoom() { } -void -StateZoom_Context::load_settings() -{ - String value; - - //parse the arguments yargh! - /*if(settings.get_value("circle.feather",value)) - set_feather(atof(value.c_str())); - else - set_feather(0);*/ -} - -void -StateZoom_Context::save_settings() -{ - //settings.set_value("circle.fallofftype",strprintf("%d",get_falloff())); -} - -void -StateZoom_Context::reset() -{ - //refresh_ducks(); -} - StateZoom_Context::StateZoom_Context(CanvasView* canvas_view): canvas_view_(canvas_view), is_working(*canvas_view), - prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()), - settings(synfigapp::Main::get_selected_input_device()->settings()) + prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()) { - // Set up the tool options dialog - //options_table.attach(*manage(new Gtk::Label(_("Zoom Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - - load_settings(); - - options_table.show_all(); - - refresh_tool_options(); - App::dialog_tool_options->present(); - // Turn off layer clicking get_work_area()->set_allow_layer_clicks(false); @@ -191,32 +141,12 @@ StateZoom_Context::StateZoom_Context(CanvasView* canvas_view): App::toolbox->refresh(); } -void -StateZoom_Context::refresh_tool_options() -{ - App::dialog_tool_options->clear(); - App::dialog_tool_options->set_widget(options_table); - App::dialog_tool_options->set_local_name(_("Zoom Tool")); - App::dialog_tool_options->set_name("zoom"); -} - -Smach::event_result -StateZoom_Context::event_refresh_tool_options(const Smach::event& /*x*/) -{ - refresh_tool_options(); - return Smach::RESULT_ACCEPT; -} - StateZoom_Context::~StateZoom_Context() { - save_settings(); - // Restore layer clicking get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_); get_canvas_view()->work_area->reset_cursor(); - App::dialog_tool_options->clear(); - // Enable the time bar //get_canvas_view()->set_sensitive_timebar(true); @@ -252,37 +182,34 @@ StateZoom_Context::event_mouse_click_handler(const Smach::event& x) if(event.button==BUTTON_LEFT) { - //respond to event box... - - - //Center the new position at the center of the box - - //OH MY GOD HACK - the space is -1* and offset (by the value of the center of the canvas)... - Point newpos; - { - const Point evcenter = (event.p1+event.p2)/2; - const Point realcenter = (get_work_area()->get_window_tl() + get_work_area()->get_window_br())/2; - newpos = -(evcenter - realcenter) + get_work_area()->get_focus_point(); - } - - //The zoom will be whatever the required factor to convert current box size to desired box size Point tl = get_work_area()->get_window_tl(); Point br = get_work_area()->get_window_br(); + Vector window_span = br - tl, window_middle = (br+tl)/2; + Vector box_span = event.p2 - event.p1, box_middle = (event.p1+event.p2)/2; + Point newpos; + float zoom; - Vector span = br - tl; - Vector v = event.p2 - event.p1; - - //get the minimum zoom as long as it's greater than 1... - v[0] = abs(v[0])/abs(span[0]); - v[1] = abs(v[1])/abs(span[1]); + if(event.modifier & Gdk::CONTROL_MASK) //zoom out... + { + if (window_span[0] == 0 || window_span[1] == 0) zoom = 1; + else zoom = max(abs(box_span[0]/window_span[0]), abs(box_span[1]/window_span[1])); - float zdiv = max(v[0],v[1]); - if(zdiv < 1 && zdiv > 0) //must be zoomable + // focus_point is -1 times the real position for some reason... + // center the window so the old contents fill the drawn box + newpos = -((window_middle - box_middle)/zoom + window_middle); + } + else // zoom in { - get_work_area()->set_focus_point(newpos); - get_work_area()->set_zoom(get_work_area()->get_zoom()/zdiv); + if (box_span[0] == 0 || box_span[1] == 0) zoom = 1; + else zoom = min(abs(window_span[0]/box_span[0]), abs(window_span[1]/box_span[1])); + + // center the window at the center of the box + newpos = -(-get_work_area()->get_focus_point() + (box_middle - window_middle)); } + get_work_area()->set_focus_point(newpos); + get_work_area()->set_zoom(get_work_area()->get_zoom()*zoom); + return Smach::RESULT_ACCEPT; } }