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_stroke.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp
index
baf7ebd
..
088a978
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_stroke.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_stroke.cpp
@@
-47,6
+47,8
@@
#include "toolbox.h"
#include <synfigapp/main.h>
#include "toolbox.h"
#include <synfigapp/main.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-174,7
+176,9
@@
StateStroke_Context::event_mouse_up_handler(const Smach::event& x)
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
- return Smach::RESULT_ACCEPT;
+ 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;
@@
-196,7
+200,9
@@
StateStroke_Context::event_mouse_draw_handler(const Smach::event& x)
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
}
case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
- return Smach::RESULT_ACCEPT;
+ 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;