projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trying to prevent a crash when changing render quality meanwhile updating work area.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_eyedrop.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
index
711e166
..
6fb940d
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp
@@
-40,6
+40,8
@@
#include "canvasview.h"
#include <synfigapp/main.h>
#include "canvasview.h"
#include <synfigapp/main.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-95,7
+97,7
@@
StateEyedrop_Context::StateEyedrop_Context(CanvasView *canvas_view):
canvas_view(canvas_view),
is_working(*canvas_view)
{
canvas_view(canvas_view),
is_working(*canvas_view)
{
- synfig::info("Enter
t
ed Eyedrop State");
+ synfig::info("Entered Eyedrop State");
canvas_view->work_area->set_cursor(Gdk::Cursor(Gdk::CROSSHAIR));
App::toolbox->refresh();
canvas_view->work_area->set_cursor(Gdk::Cursor(Gdk::CROSSHAIR));
App::toolbox->refresh();
@@
-133,7
+135,7
@@
StateEyedrop_Context::event_workarea_mouse_button_down_handler(const Smach::even
if(event.button==BUTTON_LEFT)
{
Color color(canvas_view->get_canvas()->get_context().get_color(event.pos));
if(event.button==BUTTON_LEFT)
{
Color color(canvas_view->get_canvas()->get_context().get_color(event.pos));
- synfigapp::Main::set_
foreground
_color(color);
+ synfigapp::Main::set_
outline
_color(color);
studio::App::dialog_color->set_color(color);
return Smach::RESULT_ACCEPT;
}
studio::App::dialog_color->set_color(color);
return Smach::RESULT_ACCEPT;
}