}
- virtual bool start_frame(synfig::ProgressCallback *cb)
+ virtual bool start_frame(synfig::ProgressCallback */*cb*/)
{
synfig::Mutex::Lock lock(mutex);
}
- virtual bool start_frame(synfig::ProgressCallback *cb)
+ virtual bool start_frame(synfig::ProgressCallback */*cb*/)
{
return true;
}
if(!data.empty())
{
if(!load_sketch(data))
- load_sketch(dirname(canvas->get_file_name())+ETL_DIRECTORY_SEPERATOR+basename(data));
+ load_sketch(dirname(canvas->get_file_name())+ETL_DIRECTORY_SEPARATOR+basename(data));
}
}
if(canvas_view->get_smach().process_event(EventBox(drag_point,mouse_pos,MouseButton(event->button.button),modifier))==Smach::RESULT_ACCEPT)
return true;
- if(!(modifier&GDK_CONTROL_MASK) && !(modifier&GDK_SHIFT_MASK))
+ // when dragging a box around some ducks:
+ // SHIFT selects; CTRL toggles; SHIFT+CTRL unselects; <none> clears all then selects
+ if(modifier&GDK_SHIFT_MASK)
+ select_ducks_in_box(drag_point,mouse_pos);
+
+ if(modifier&GDK_CONTROL_MASK)
+ toggle_select_ducks_in_box(drag_point,mouse_pos);
+ else if(!(modifier&GDK_SHIFT_MASK))
+ {
clear_selected_ducks();
- select_ducks_in_box(drag_point,mouse_pos);
+ select_ducks_in_box(drag_point,mouse_pos);
+ }
ret=true;
}
else
}
bool
-WorkArea::on_hruler_event(GdkEvent *event)
+WorkArea::on_hruler_event(GdkEvent */*event*/)
{
/*
switch(event->type)
}
bool
-WorkArea::on_vruler_event(GdkEvent *event)
+WorkArea::on_vruler_event(GdkEvent */*event*/)
{
/*
switch(event->type)
}
synfig::Point
-WorkArea::comp_to_screen_coords(synfig::Point pos)const
+WorkArea::comp_to_screen_coords(synfig::Point /*pos*/)const
{
synfig::warning("WorkArea::comp_to_screen_coords: Not yet implemented");
return synfig::Point();
if(!async_renderer)
return;
- // If we completed successfuly, then
+ // If we completed successfully, then
// we aren't dirty anymore
if(async_renderer->has_success())
{
// it is being displayed correctly
drawing_area->queue_draw();
- // If we completed successfuly, then
+ // If we completed successfully, then
// we aren't dirty anymore
if(ret)
{