X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=09c38f236403331e98755aa75498ae1751aa3477;hb=41063fc828642a7ae12aeb50694f1cd4580eb467;hp=f2b932ff953817317621eb57140191376ab28169;hpb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index f2b932f..09c38f2 100644 --- a/synfig-studio/trunk/src/gtkmm/workarea.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp @@ -7,7 +7,7 @@ ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2006 Yue Shi Lai -** Copyright (c) 2007 Chris Moore +** Copyright (c) 2007, 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 @@ -1347,8 +1347,11 @@ WorkArea::on_drawing_area_event(GdkEvent *event) selected_bezier=find_bezier(mouse_pos,radius,&bezier_click_pos); - if(duck && duck->get_editable()) + if(duck) { + if (!duck->get_editable()) + return true; + //get_selected_duck()->signal_user_click(0)(); //if(clicked_duck)clicked_duck->signal_user_click(0)(); @@ -1921,9 +1924,6 @@ WorkArea::refresh_dimension_info() pw=canvaswidth/w; ph=canvasheight/h; - Duckmatic::set_flip_x(pw < 0); - Duckmatic::set_flip_y(ph > 0); - scrollx_adjustment.set_page_increment(abs(get_grid_size()[0])); scrollx_adjustment.set_step_increment(abs(pw)); scrollx_adjustment.set_lower(-abs(canvaswidth));