X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=f2b932ff953817317621eb57140191376ab28169;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=6e31a6ef3566a0d5993dd4276da13a41fdfd26fc;hpb=88ce128b7cd6fb5699e97ab4d3e7263414262aba;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index 6e31a6e..f2b932f 100644 --- a/synfig-studio/trunk/src/gtkmm/workarea.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp @@ -6,7 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley -** Copyright 2006 Yue Shi Lai +** Copyright (c) 2006 Yue Shi Lai ** Copyright (c) 2007 Chris Moore ** ** This package is free software; you can redistribute it and/or @@ -171,8 +171,9 @@ public: set_clipping(true); if(low_res) { - set_tile_w(workarea->tile_w/2); - set_tile_h(workarea->tile_h/2); + int div = workarea->get_low_res_pixel_size(); + set_tile_w(workarea->tile_w/div); + set_tile_h(workarea->tile_h/div); } else { @@ -192,8 +193,10 @@ public: { assert(workarea); newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN); - if(low_res) - newdesc->set_wh(w/2,h/2); + if(low_res) { + int div = workarea->get_low_res_pixel_size(); + newdesc->set_wh(w/div,h/div); + } else newdesc->set_wh(w,h); @@ -305,7 +308,10 @@ public: int w(get_tile_w()); int h(get_tile_h()); int x(surface.get_w()*surface.get_h()); - //if(low_res) { w/=2,h/=2; } + //if(low_res) { + // int div = workarea->get_low_res_pixel_size(); + // w/=div,h/=div; + //} Color dark(0.6,0.6,0.6); Color lite(0.8,0.8,0.8); for(int i=0;iget_low_res_pixel_size(); pixbuf=pixbuf->scale_simple( - surface.get_w()*2, - surface.get_h()*2, + surface.get_w()*div, + surface.get_h()*div, Gdk::INTERP_NEAREST ); } @@ -468,7 +475,10 @@ public: assert(workarea); newdesc->set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN); if(low_res) - newdesc->set_wh(w/2,h/2); + { + int div = workarea->get_low_res_pixel_size(); + newdesc->set_wh(w/div,h/div); + } else newdesc->set_wh(w,h); @@ -544,15 +554,19 @@ public: int w(surface.get_w()); //int h(surface.get_h()); int x(surface.get_w()*surface.get_h()); - //if(low_res) { w/=2,h/=2; } + //if(low_res) { + // int div = workarea->get_low_res_pixel_size(); + // w/=div,h/=div; + //} Color dark(0.6,0.6,0.6); Color lite(0.8,0.8,0.8); int tw=workarea->tile_w; int th=workarea->tile_h; if(low_res) { - tw/=2; - th/=2; + int div = workarea->get_low_res_pixel_size(); + tw/=div; + th/=div; } for(int i=0;iget_low_res_pixel_size(); pixbuf=pixbuf->scale_simple( - surface.get_w()*2, - surface.get_h()*2, + surface.get_w()*div, + surface.get_h()*div, Gdk::INTERP_NEAREST ); } @@ -649,6 +664,7 @@ WorkArea::WorkArea(etl::loose_handle canvas_interfac render_idle_func_id=0; zoom=prev_zoom=1.0; quality=10; + low_res_pixel_size=2; rendering=false; canceled_=false; low_resolution=true; @@ -892,6 +908,8 @@ WorkArea::load_meta_data() if(!tmp.empty()) gx=stratof(tmp); + else + synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str()); if(iter==data.end()) tmp.clear(); @@ -900,11 +918,11 @@ WorkArea::load_meta_data() if(!tmp.empty()) gy=stratof(tmp); + else + synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str()); set_grid_size(Vector(gx,gy)); } - else - synfig::error("WorkArea::load_meta_data(): Unable to parse data for \"grid_size\", which was \"%s\"",data.c_str()); data=canvas->get_meta_data("grid_show"); if(data.size() && (data=="1" || data[0]=='t' || data[0]=='T')) @@ -1181,8 +1199,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 || @@ -1202,6 +1218,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 @@ -1904,6 +1921,9 @@ 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)); @@ -1976,7 +1996,8 @@ 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); - const int width_in_tiles(w/tile_w+((low_resolution?((w/2)%(tile_w/2)):(w%tile_w))?1:0)); + 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)); int @@ -2142,6 +2163,14 @@ WorkArea::set_quality(int x) queue_render_preview(); } +void +WorkArea::set_low_res_pixel_size(int x) +{ + if(x==low_res_pixel_size) + return; + low_res_pixel_size=x; + queue_render_preview(); +} namespace studio { @@ -2229,6 +2258,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); @@ -2239,8 +2273,9 @@ studio::WorkArea::async_update_preview() handle target; // if we have lots of pixels to render and the tile renderer isn't disabled, use it - if(w*h>(low_resolution?480*270:480*270/2) && - !getenv("SYNFIG_DISABLE_TILE_RENDER")) + int div; + div = low_resolution ? low_res_pixel_size : 1; + if (w*h > 240*div*135*div && !getenv("SYNFIG_DISABLE_TILE_RENDER")) { // do a tile render handle trgt(new class WorkAreaTarget(this,w,h));