summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2019-07-29 11:03:18 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-07-31 05:03:14 +0000
commitd85db25f6371a300b6f1d2a10e0bcf4e45caed7f (patch)
tree20390201ed140ed15099f50531bb5efb74b5505f
parentImprovements to event tool handler (diff)
downloadinkscape-d85db25f6371a300b6f1d2a10e0bcf4e45caed7f.tar.gz
inkscape-d85db25f6371a300b6f1d2a10e0bcf4e45caed7f.zip
Fix codding style
-rw-r--r--src/ui/tools/tool-base.cpp11
-rw-r--r--src/ui/tools/tool-base.h12
2 files changed, 13 insertions, 10 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 4e21f2bbf..bb66fc970 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -345,7 +345,8 @@ bool ToolBase::_keyboardMove(GdkEventKey const &event, Geom::Point const &dir)
/**
* This function allow to handle global tool events if not _pre function is full overrided.
*/
-bool ToolBase::root_handler_impl(GdkEvent* event) {
+bool ToolBase::root_handler_impl(GdkEvent *event)
+{
switch (event->type) {
case GDK_BUTTON_PRESS:
switch (event->button.button) {
@@ -975,7 +976,8 @@ bool ToolBase::root_handler(GdkEvent* event) {
* This function allow to handle global tool events if not _pre function is full overrided.
*/
-bool ToolBase::item_handler_impl(SPItem* item, GdkEvent* event) {
+bool ToolBase::item_handler_impl(SPItem *item, GdkEvent *event)
+{
switch (event->type) {
case GDK_BUTTON_PRESS:
switch (event->button.button) {
@@ -1021,7 +1023,8 @@ bool ToolBase::item_handler(SPItem* item, GdkEvent* event) {
switch (event->type) {
case GDK_BUTTON_PRESS:
- if (event->button.button == 3 && !((event->button.state & GDK_SHIFT_MASK) || (event->button.state & GDK_CONTROL_MASK))) {
+ if (event->button.button == 3 &&
+ !((event->button.state & GDK_SHIFT_MASK) || (event->button.state & GDK_CONTROL_MASK))) {
sp_event_root_menu_popup(this->desktop, item, event);
ret = TRUE;
}
@@ -1194,7 +1197,7 @@ gint sp_event_context_virtual_item_handler(ToolBase * event_context, SPItem * it
if (event_context) { // If no event-context is available then do nothing, otherwise Inkscape would crash
// (see the comment in SPDesktop::set_event_context, and bug LP #622350)
//ret = (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(event_context)))->item_handler(event_context, item, event);
- ret = event_context->item_handler_impl(item, event);
+ ret = event_context->item_handler_impl(item, event);
if (!ret) {
ret = sp_event_context_virtual_root_handler(event_context, event);
diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h
index fe1f5afee..962e161a1 100644
--- a/src/ui/tools/tool-base.h
+++ b/src/ui/tools/tool-base.h
@@ -193,10 +193,10 @@ public:
// Is called by our pref_observer if a preference has been changed.
virtual void set(const Inkscape::Preferences::Entry& val);
- virtual bool root_handler_impl(GdkEvent* event);
- virtual bool root_handler(GdkEvent* event);
- virtual bool item_handler_impl(SPItem* item, GdkEvent* event);
- virtual bool item_handler(SPItem* item, GdkEvent* event);
+ virtual bool root_handler_impl(GdkEvent *event);
+ virtual bool root_handler(GdkEvent* event);
+ virtual bool item_handler_impl(SPItem *item, GdkEvent *event);
+ virtual bool item_handler(SPItem* item, GdkEvent* event);
virtual const std::string& getPrefsPath() = 0;
@@ -236,8 +236,8 @@ protected:
bool sp_event_context_knot_mouseover() const;
private:
- bool _keyboardMove(GdkEventKey const &event, Geom::Point const &dir);
- void sp_event_context_set_cursor(GdkCursorType cursor_type);
+ bool _keyboardMove(GdkEventKey const &event, Geom::Point const &dir);
+ void sp_event_context_set_cursor(GdkCursorType cursor_type);
};