projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_stroke.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
index
fc16a32
..
a0f7eca
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_stroke.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_stroke.cpp
@@
-129,7
+129,7
@@
StateStroke_Context::StateStroke_Context(CanvasView* canvas_view):
width_data.spawn();
stroke_data.spawn();
width_data.spawn();
stroke_data.spawn();
- get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_
foreground
_color());
+ get_work_area()->add_stroke(stroke_data, synfigapp::Main::get_
outline
_color());
}
StateStroke_Context::~StateStroke_Context()
}
StateStroke_Context::~StateStroke_Context()
@@
-173,11
+173,6
@@
StateStroke_Context::event_mouse_up_handler(const Smach::event& x)
throw Smach::pop_exception();
}
throw Smach::pop_exception();
}
- case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
- printf("%s:%d BUTTON_RIGHT\n", __FILE__, __LINE__);
- if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
- return Smach::RESULT_ACCEPT;
-
default:
return Smach::RESULT_OK;
}
default:
return Smach::RESULT_OK;
}
@@
-197,11
+192,6
@@
StateStroke_Context::event_mouse_draw_handler(const Smach::event& x)
return Smach::RESULT_ACCEPT;
}
return Smach::RESULT_ACCEPT;
}
- case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
- printf("%s:%d BUTTON_RIGHT\n", __FILE__, __LINE__);
- if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
- return Smach::RESULT_ACCEPT;
-
default:
return Smach::RESULT_OK;
}
default:
return Smach::RESULT_OK;
}