X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=c4f8be6eea49a76fd7fe4eede0e7a5ad4818b289;hb=e2d2732c368b92259bba1bef890223831d997b5b;hp=5cd526d60149515fe754988bb60352cae6da0b3c;hpb=b6c331ec41a1788c39606b9c398a25f801bacb4a;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index 5cd526d..c4f8be6 100644 --- a/synfig-studio/trunk/src/gtkmm/workarea.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp @@ -6,8 +6,8 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright 2006 Yue Shi Lai -** Copyright (c) 2007 Chris Moore +** Copyright (c) 2006 Yue Shi Lai +** 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 @@ -171,7 +171,7 @@ public: set_clipping(true); if(low_res) { - int div = 1 << workarea->get_lowrespixel(); + int div = workarea->get_low_res_pixel_size(); set_tile_w(workarea->tile_w/div); set_tile_h(workarea->tile_h/div); } @@ -194,7 +194,7 @@ public: assert(workarea); newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN); if(low_res) { - int div = 1 << workarea->get_lowrespixel(); + int div = workarea->get_low_res_pixel_size(); newdesc->set_wh(w/div,h/div); } else @@ -309,7 +309,7 @@ public: int h(get_tile_h()); int x(surface.get_w()*surface.get_h()); //if(low_res) { - // int div = 1 << workarea->get_lowrespixel(); + // int div = workarea->get_low_res_pixel_size(); // w/=div,h/=div; //} Color dark(0.6,0.6,0.6); @@ -351,7 +351,7 @@ public: if(low_res) { // We need to scale up - int div = 1 << workarea->get_lowrespixel(); + int div = workarea->get_low_res_pixel_size(); pixbuf=pixbuf->scale_simple( surface.get_w()*div, surface.get_h()*div, @@ -476,7 +476,7 @@ public: newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN); if(low_res) { - int div = 1 << workarea->get_lowrespixel(); + int div = workarea->get_low_res_pixel_size(); newdesc->set_wh(w/div,h/div); } else @@ -555,7 +555,7 @@ public: //int h(surface.get_h()); int x(surface.get_w()*surface.get_h()); //if(low_res) { - // int div = 1 << workarea->get_lowrespixel(); + // int div = workarea->get_low_res_pixel_size(); // w/=div,h/=div; //} Color dark(0.6,0.6,0.6); @@ -564,7 +564,7 @@ public: int th=workarea->tile_h; if(low_res) { - int div = 1 << workarea->get_lowrespixel(); + int div = workarea->get_low_res_pixel_size(); tw/=div; th/=div; } @@ -597,7 +597,7 @@ public: if(low_res) { // We need to scale up - int div = 1 << workarea->get_lowrespixel(); + int div = workarea->get_low_res_pixel_size(); pixbuf=pixbuf->scale_simple( surface.get_w()*div, surface.get_h()*div, @@ -664,7 +664,7 @@ WorkArea::WorkArea(etl::loose_handle canvas_interfac render_idle_func_id=0; zoom=prev_zoom=1.0; quality=10; - lowrespixel=1; + low_res_pixel_size=2; rendering=false; canceled_=false; low_resolution=true; @@ -828,18 +828,22 @@ WorkArea::~WorkArea() render_idle_func_id=0; } +#ifdef SINGLE_THREADED bool WorkArea::get_updating()const { return App::single_threaded && async_renderer && async_renderer->updating; } +#endif +#ifdef SINGLE_THREADED void WorkArea::stop_updating(bool cancel) { async_renderer->stop(); if (cancel) canceled_=true; } +#endif void WorkArea::save_meta_data() @@ -1164,7 +1168,7 @@ WorkArea::on_key_press_event(GdkEventKey* event) break; } - synfigapp::Action::PassiveGrouper grouper(instance.get(),"Nudge"); + synfigapp::Action::PassiveGrouper grouper(instance.get(),_("Nudge")); // Grid snap does not apply to nudging bool grid_snap_holder(get_grid_snap()); @@ -1199,8 +1203,6 @@ WorkArea::on_drawing_area_event(GdkEvent *event) bool is_mouse(false); Gdk::ModifierType modifier(Gdk::ModifierType(0)); - drawing_area->grab_focus(); - // Handle input stuff if( event->any.type==GDK_MOTION_NOTIFY || @@ -1220,6 +1222,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event) { device=event->button.device; modifier=Gdk::ModifierType(event->button.state); + drawing_area->grab_focus(); } // Make sure we recognize the device @@ -1348,8 +1351,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)(); @@ -1618,7 +1624,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event) else if(dragging==DRAG_DUCK) { - synfigapp::Action::PassiveGrouper grouper(instance.get(),"Move"); + synfigapp::Action::PassiveGrouper grouper(instance.get(),_("Move")); dragging=DRAG_NONE; //translate_selected_ducks(mouse_pos); set_axis_lock(false); @@ -1994,7 +2000,7 @@ WorkArea::next_unrendered_tile(int refreshes)const x(focus_point[0]/pw+drawing_area->get_width()/2-w/2), y(focus_point[1]/ph+drawing_area->get_height()/2-h/2); - int div = 1 << lowrespixel; + int div = low_res_pixel_size; const int width_in_tiles(w/tile_w+((low_resolution?((w/div)%(tile_w/div)):(w%tile_w))?1:0)); const int height_in_tiles(h/tile_h+(h%tile_h?1:0)); @@ -2162,11 +2168,11 @@ WorkArea::set_quality(int x) } void -WorkArea::set_lowrespixel(int x) +WorkArea::set_low_res_pixel_size(int x) { - if(x==lowrespixel) + if(x==low_res_pixel_size) return; - lowrespixel=x; + low_res_pixel_size=x; queue_render_preview(); } @@ -2214,12 +2220,14 @@ public: bool studio::WorkArea::async_update_preview() { +#ifdef SINGLE_THREADED if (get_updating()) { stop_updating(); queue_render_preview(); return false; } +#endif async_renderer=0; @@ -2256,6 +2264,11 @@ studio::WorkArea::async_update_preview() int w=(int)(desc.get_w()*zoom); int h=(int)(desc.get_h()*zoom); + // ensure that the size we draw is at least one pixel in each dimension + int min_size = low_resolution ? low_res_pixel_size : 1; + if (w < min_size) w = min_size; + if (h < min_size) h = min_size; + // Setup the description parameters desc.set_antialias(1); desc.set_time(cur_time); @@ -2267,7 +2280,7 @@ studio::WorkArea::async_update_preview() // if we have lots of pixels to render and the tile renderer isn't disabled, use it int div; - div = low_resolution ? (1 << lowrespixel) : 1; + div = low_resolution ? low_res_pixel_size : 1; if (w*h > 240*div*135*div && !getenv("SYNFIG_DISABLE_TILE_RENDER")) { // do a tile render