Merge branch 'zelgadis_master'

diff --combined synfig-studio/src/gtkmm/app.cpp
index 0068f86,68c8795..d2d3443
--- 1/synfig-studio/src/gtkmm/app.cpp
--- 2/synfig-studio/src/gtkmm/app.cpp
+++ b/synfig-studio/src/gtkmm/app.cpp
@@@ -1299,23 -1299,25 +1299,25 @@@ App::App(int *argc, char ***argv)
                state_manager->add_state(&state_scale);
                state_manager->add_state(&state_rotate);
                studio_init_cb.task(_("Init ModMirror...")); module_list_.push_back(new ModMirror()); module_list_.back()->start();
-               if(!getenv("SYNFIG_DISABLE_WIDTH"  )) state_manager->add_state(&state_width); // Enabled since 0.61.09
  
-               /* new objects */
+               /* geometry */
                state_manager->add_state(&state_circle);
                state_manager->add_state(&state_rectangle);
                state_manager->add_state(&state_star);
                state_manager->add_state(&state_gradient);
                if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon); // Enabled - for working without ducks
-               state_manager->add_state(&state_text);
+               
+               /* bline tools */
                state_manager->add_state(&state_bline);
                if(!getenv("SYNFIG_DISABLE_DRAW"   )) state_manager->add_state(&state_draw); // Enabled for now.  Let's see whether they're good enough yet.
- 
-               /* other */
+               if(!getenv("SYNFIG_DISABLE_WIDTH"  )) state_manager->add_state(&state_width); // Enabled since 0.61.09
                state_manager->add_state(&state_fill);
                state_manager->add_state(&state_eyedrop);
-               state_manager->add_state(&state_zoom);
+               
+               /* other */
+               state_manager->add_state(&state_text);
                if(!getenv("SYNFIG_DISABLE_SKETCH" )) state_manager->add_state(&state_sketch);
+               state_manager->add_state(&state_zoom);
  
                studio_init_cb.task(_("Init ModPalette..."));
                module_list_.push_back(new ModPalette()); module_list_.back()->start();
@@@ -1468,10 -1470,13 +1470,10 @@@ App::get_config_file(const synfig::Stri
        return Glib::build_filename(get_user_app_directory(),file);
  }
  
 -#define SCALE_FACTOR  (1280)
  //! set the \a instance's canvas(es) position and size to be those specified in the first entry of recent_files_window_size
  void
  App::set_recent_file_window_size(etl::handle<Instance> instance)
  {
 -      int screen_w(Gdk::screen_width());
 -      int screen_h(Gdk::screen_height());
  
        const std::string &canvas_window_size = *recent_files_window_size.begin();
  
@@@ -1517,9 -1522,22 +1519,9 @@@
                        current = separator+1;
                        continue;
                }
 -
 -              if (x > SCALE_FACTOR) x = SCALE_FACTOR - 150; if (x < 0) x = 0;
 -              if (y > SCALE_FACTOR) y = SCALE_FACTOR - 150; if (y < 0) y = 0;
 -              x=x*screen_w/SCALE_FACTOR;
 -              y=y*screen_h/SCALE_FACTOR;
 -              if(getenv("SYNFIG_WINDOW_POSITION_X_OFFSET"))
 -                      x += atoi(getenv("SYNFIG_WINDOW_POSITION_X_OFFSET"));
 -              if(getenv("SYNFIG_WINDOW_POSITION_Y_OFFSET"))
 -                      y += atoi(getenv("SYNFIG_WINDOW_POSITION_Y_OFFSET"));
 -
 -              if (w > SCALE_FACTOR) w = 150; if (w < 0) w = 0;
 -              if (h > SCALE_FACTOR) h = 150; if (h < 0) h = 0;
 -
                CanvasView::Handle canvasview = instance->find_canvas_view(canvas);
                canvasview->move(x,y);
 -              canvasview->resize(w*screen_w/SCALE_FACTOR,h*screen_h/SCALE_FACTOR);
 +              canvasview->resize(w,h);
                canvasview->present();
  
                current = separator+1;
@@@ -1532,6 -1550,8 +1534,6 @@@
  void
  App::add_recent_file(const etl::handle<Instance> instance)
  {
 -      int screen_w(Gdk::screen_width());
 -      int screen_h(Gdk::screen_height());
  
        std::string canvas_window_size;
  
@@@ -1550,12 -1570,13 +1552,12 @@@
  
                canvas_window_size += strprintf("%s %d %d %d %d\t",
                                                                                canvas->get_relative_id(canvas->get_root()).c_str(),
 -                                                                              x_pos*SCALE_FACTOR/screen_w,  y_pos*SCALE_FACTOR/screen_h,
 -                                                                              x_size*SCALE_FACTOR/screen_w, y_size*SCALE_FACTOR/screen_h);
 +                                                                              x_pos,  y_pos,
 +                                                                              x_size, y_size);
        }
  
        add_recent_file(absolute_path(instance->get_file_name()), canvas_window_size);
  }
 -#undef SCALE_FACTOR
  
  void
  App::add_recent_file(const std::string &file_name, const std::string &window_size)