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_sketch.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
index
71a1ec8
..
5a8ec15
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_sketch.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_sketch.cpp
@@
-60,6
+60,8
@@
#include <gtkmm/checkbutton.h>
#include <gtkmm/actiongroup.h>
#include <gtkmm/checkbutton.h>
#include <gtkmm/actiongroup.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-189,14
+191,14
@@
StateSketch_Context::load_sketch()
void
StateSketch_Context::clear_sketch()
{
void
StateSketch_Context::clear_sketch()
{
- get_work_area()->clear_persist
a
nt_strokes();
+ get_work_area()->clear_persist
e
nt_strokes();
// if the sketch is currently shown, make sure it is updated
//! \todo is there a better way than this of getting Duckmatic to update its stroke_list_?
if (checkbutton_show_sketch.get_active())
{
// if the sketch is currently shown, make sure it is updated
//! \todo is there a better way than this of getting Duckmatic to update its stroke_list_?
if (checkbutton_show_sketch.get_active())
{
- get_work_area()->set_show_persist
a
nt_strokes(false);
- get_work_area()->set_show_persist
a
nt_strokes(true);
+ get_work_area()->set_show_persist
e
nt_strokes(false);
+ get_work_area()->set_show_persist
e
nt_strokes(true);
get_canvas_view()->get_smach().process_event(EVENT_REFRESH);
}
}
get_canvas_view()->get_smach().process_event(EVENT_REFRESH);
}
}
@@
-204,16
+206,16
@@
StateSketch_Context::clear_sketch()
void
StateSketch_Context::undo_stroke()
{
void
StateSketch_Context::undo_stroke()
{
- if(!get_work_area()->persist
a
nt_stroke_list().empty())
+ if(!get_work_area()->persist
e
nt_stroke_list().empty())
{
{
- get_work_area()->persist
a
nt_stroke_list().pop_back();
+ get_work_area()->persist
e
nt_stroke_list().pop_back();
// if the sketch is currently shown, make sure it is updated
//! \todo is there a better way than this of getting Duckmatic to update its stroke_list_?
if (checkbutton_show_sketch.get_active())
{
// if the sketch is currently shown, make sure it is updated
//! \todo is there a better way than this of getting Duckmatic to update its stroke_list_?
if (checkbutton_show_sketch.get_active())
{
- get_work_area()->set_show_persist
a
nt_strokes(false);
- get_work_area()->set_show_persist
a
nt_strokes(true);
+ get_work_area()->set_show_persist
e
nt_strokes(false);
+ get_work_area()->set_show_persist
e
nt_strokes(true);
get_canvas_view()->get_smach().process_event(EVENT_REFRESH);
}
}
get_canvas_view()->get_smach().process_event(EVENT_REFRESH);
}
}
@@
-222,7
+224,7
@@
StateSketch_Context::undo_stroke()
void
StateSketch_Context::toggle_show_sketch()
{
void
StateSketch_Context::toggle_show_sketch()
{
- get_work_area()->set_show_persist
a
nt_strokes(checkbutton_show_sketch.get_active());
+ get_work_area()->set_show_persist
e
nt_strokes(checkbutton_show_sketch.get_active());
get_work_area()->queue_draw();
}
get_work_area()->queue_draw();
}
@@
-230,7
+232,7
@@
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
action_group(Gtk::ActionGroup::create()),
canvas_view_(canvas_view),
is_working(*canvas_view),
action_group(Gtk::ActionGroup::create()),
canvas_view_(canvas_view),
is_working(*canvas_view),
- prev_workarea_layer_status_(get_work_area()->
allow_layer_clicks
),
+ prev_workarea_layer_status_(get_work_area()->
get_allow_layer_clicks()
),
button_clear_sketch(_("Clear Sketch")),
button_undo_stroke(_("Undo Stroke")),
button_save_sketch(_("Save Sketch")),
button_clear_sketch(_("Clear Sketch")),
button_undo_stroke(_("Undo Stroke")),
button_save_sketch(_("Save Sketch")),
@@
-313,7
+315,7
@@
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
App::ui_manager()->add_ui_from_string(ui_info);
App::ui_manager()->add_ui_from_string(ui_info);
- checkbutton_show_sketch.set_active(get_work_area()->get_show_persist
a
nt_strokes());
+ checkbutton_show_sketch.set_active(get_work_area()->get_show_persist
e
nt_strokes());
button_clear_sketch.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::clear_sketch));
button_undo_stroke.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::undo_stroke));
button_clear_sketch.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::clear_sketch));
button_undo_stroke.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::undo_stroke));
@@
-333,12
+335,12
@@
StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
App::dialog_tool_options->present();
// Turn off layer clicking
App::dialog_tool_options->present();
// Turn off layer clicking
- get_work_area()->
allow_layer_clicks=false
;
+ get_work_area()->
set_allow_layer_clicks(false)
;
get_canvas_view()->work_area->set_cursor(Gdk::PENCIL);
// Turn off duck clicking
get_canvas_view()->work_area->set_cursor(Gdk::PENCIL);
// Turn off duck clicking
- get_work_area()->
allow_duck_clicks=false
;
+ get_work_area()->
set_allow_duck_clicks(false)
;
// clear out the ducks
//get_work_area()->clear_ducks();
// clear out the ducks
//get_work_area()->clear_ducks();
@@
-366,10
+368,10
@@
StateSketch_Context::~StateSketch_Context()
App::dialog_tool_options->clear();
// Restore layer clicking
App::dialog_tool_options->clear();
// Restore layer clicking
- get_work_area()->
allow_layer_clicks=prev_workarea_layer_status_
;
+ get_work_area()->
set_allow_layer_clicks(prev_workarea_layer_status_)
;
// Restore duck clicking
// Restore duck clicking
- get_work_area()->
allow_duck_clicks=true
;
+ get_work_area()->
set_allow_duck_clicks(true)
;
// Enable the time bar
//get_canvas_view()->set_sensitive_timebar(true);
// Enable the time bar
//get_canvas_view()->set_sensitive_timebar(true);
@@
-486,8
+488,9
@@
StateSketch_Context::event_mouse_down_handler(const Smach::event& x)
return Smach::RESULT_ACCEPT;
}
return Smach::RESULT_ACCEPT;
}
- case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu
- return Smach::RESULT_ACCEPT;
+ case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
+ if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
+ return Smach::RESULT_ACCEPT;
default:
return Smach::RESULT_OK;
default:
return Smach::RESULT_OK;
@@
-501,7
+504,7
@@
StateSketch_Context::event_stroke(const Smach::event& x)
assert(event.stroke_data);
assert(event.stroke_data);
- get_work_area()->add_persist
a
nt_stroke(event.stroke_data,synfigapp::Main::get_foreground_color());
+ get_work_area()->add_persist
e
nt_stroke(event.stroke_data,synfigapp::Main::get_foreground_color());
return Smach::RESULT_ACCEPT;
}
return Smach::RESULT_ACCEPT;
}