projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_normal.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_normal.cpp
b/synfig-studio/trunk/src/gtkmm/state_normal.cpp
index
dc898f4
..
992db47
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_normal.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_normal.cpp
@@
-41,6
+41,8
@@
#include <synfig/valuenode_composite.h>
#include <synfig/valuenode_const.h>
#include "canvasview.h"
#include <synfig/valuenode_composite.h>
#include <synfig/valuenode_const.h>
#include "canvasview.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-119,7
+121,7
@@
StateNormal::~StateNormal()
StateNormal_Context::StateNormal_Context(CanvasView *canvas_view):
canvas_view(canvas_view)
{
StateNormal_Context::StateNormal_Context(CanvasView *canvas_view):
canvas_view(canvas_view)
{
- synfig::info("Enter
t
ed Normal State");
+ synfig::info("Entered Normal State");
}
StateNormal_Context::~StateNormal_Context()
}
StateNormal_Context::~StateNormal_Context()
@@
-144,7
+146,7
@@
StateNormal_Context::event_refresh_tool_options(const Smach::event& /*x*/)
Smach::event_result
StateNormal_Context::event_stop_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateNormal_Context::event_stop_handler(const Smach::event& /*x*/)
{
- synfig::info("STATE NORMAL: Received Stop Event");
+
//
synfig::info("STATE NORMAL: Received Stop Event");
canvas_view->stop();
return Smach::RESULT_ACCEPT;
}
canvas_view->stop();
return Smach::RESULT_ACCEPT;
}
@@
-152,7
+154,7
@@
StateNormal_Context::event_stop_handler(const Smach::event& /*x*/)
Smach::event_result
StateNormal_Context::event_refresh_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateNormal_Context::event_refresh_handler(const Smach::event& /*x*/)
{
- synfig::info("STATE NORMAL: Received Refresh Event");
+
//
synfig::info("STATE NORMAL: Received Refresh Event");
canvas_view->rebuild_tables();
canvas_view->work_area->queue_render_preview();
return Smach::RESULT_ACCEPT;
canvas_view->rebuild_tables();
canvas_view->work_area->queue_render_preview();
return Smach::RESULT_ACCEPT;
@@
-161,7
+163,7
@@
StateNormal_Context::event_refresh_handler(const Smach::event& /*x*/)
Smach::event_result
StateNormal_Context::event_refresh_ducks_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateNormal_Context::event_refresh_ducks_handler(const Smach::event& /*x*/)
{
- synfig::info("STATE NORMAL: Received Refresh Ducks");
+
//
synfig::info("STATE NORMAL: Received Refresh Ducks");
canvas_view->queue_rebuild_ducks();
return Smach::RESULT_ACCEPT;
}
canvas_view->queue_rebuild_ducks();
return Smach::RESULT_ACCEPT;
}
@@
-169,7
+171,7
@@
StateNormal_Context::event_refresh_ducks_handler(const Smach::event& /*x*/)
Smach::event_result
StateNormal_Context::event_undo_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateNormal_Context::event_undo_handler(const Smach::event& /*x*/)
{
- synfig::info("STATE NORMAL: Received Undo Event");
+
//
synfig::info("STATE NORMAL: Received Undo Event");
canvas_view->get_instance()->undo();
return Smach::RESULT_ACCEPT;
}
canvas_view->get_instance()->undo();
return Smach::RESULT_ACCEPT;
}
@@
-177,7
+179,7
@@
StateNormal_Context::event_undo_handler(const Smach::event& /*x*/)
Smach::event_result
StateNormal_Context::event_redo_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateNormal_Context::event_redo_handler(const Smach::event& /*x*/)
{
- synfig::info("STATE NORMAL: Received Redo Event");
+
//
synfig::info("STATE NORMAL: Received Redo Event");
canvas_view->get_instance()->redo();
return Smach::RESULT_ACCEPT;
}
canvas_view->get_instance()->redo();
return Smach::RESULT_ACCEPT;
}
@@
-185,7
+187,7
@@
StateNormal_Context::event_redo_handler(const Smach::event& /*x*/)
Smach::event_result
StateNormal_Context::event_mouse_button_down_handler(const Smach::event& x)
{
Smach::event_result
StateNormal_Context::event_mouse_button_down_handler(const Smach::event& x)
{
- synfig::info("STATE NORMAL: Received mouse button down Event");
+
//
synfig::info("STATE NORMAL: Received mouse button down Event");
const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
@@
-206,11
+208,11
@@
StateNormal_Context::event_layer_click(const Smach::event& x)
if(event.layer)
{
if(event.layer)
{
- synfig::info("STATE NORMAL: Received layer click Event, \"%s\"",event.layer->get_name().c_str());
+
//
synfig::info("STATE NORMAL: Received layer click Event, \"%s\"",event.layer->get_name().c_str());
}
else
{
}
else
{
- synfig::info("STATE NORMAL: Received layer click Event with an empty layer.");
+
//
synfig::info("STATE NORMAL: Received layer click Event with an empty layer.");
}
switch(event.button)
}
switch(event.button)
@@
-263,10
+265,8
@@
StateNormal_Context::edit_several_waypoints(std::list<synfigapp::ValueDesc> valu
dialog.add_button(Gtk::StockID("gtk-cancel"),0);
dialog.show();
dialog.add_button(Gtk::StockID("gtk-cancel"),0);
dialog.show();
- DEBUGPOINT();
if(dialog.run()==0)
return;
if(dialog.run()==0)
return;
- DEBUGPOINT();
synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Set Waypoints"));
std::list<synfigapp::ValueDesc>::iterator iter;
synfigapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Set Waypoints"));
std::list<synfigapp::ValueDesc>::iterator iter;
@@
-365,7
+365,7
@@
StateNormal_Context::edit_several_waypoints(std::list<synfigapp::ValueDesc> valu
Smach::event_result
StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& /*x*/)
{
Smach::event_result
StateNormal_Context::event_multiple_ducks_clicked_handler(const Smach::event& /*x*/)
{
- synfig::info("STATE NORMAL: Received multiple duck click event");
+
//
synfig::info("STATE NORMAL: Received multiple duck click event");
//const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
//const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));