diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-07-30 17:40:31 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-31 05:03:14 +0000 |
| commit | 14888ccdd79dd8b68514f3edd218a76e917f706a (patch) | |
| tree | ed50a617f70d1f90a49162d3bdad0faaddcfcfeb /src | |
| parent | Allow update mouse state when motion (diff) | |
| download | inkscape-14888ccdd79dd8b68514f3edd218a76e917f706a.tar.gz inkscape-14888ccdd79dd8b68514f3edd218a76e917f706a.zip | |
fix coding style
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 7 | ||||
| -rw-r--r-- | src/ui/tools/tool-base.h | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index 2cc05fa47..1cf537e79 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -977,7 +977,6 @@ bool ToolBase::block_button(GdkEvent *event) } else { this->_button3on = false; } - } if (this->_button1on == true && this->_button3on == true) { return true; @@ -1118,11 +1117,11 @@ gint sp_event_context_virtual_root_handler(ToolBase * event_context, GdkEvent * gint ret = false; if (event_context) { - + if (block_button(event)) { return false; } - + // The root handler also handles pressing the space key. // This will toggle the current tool and delete the current one. // Thus, save a pointer to the desktop before calling it. @@ -1177,7 +1176,7 @@ gint sp_event_context_virtual_item_handler(ToolBase * event_context, SPItem * it if (block_button(event)) { return false; } - //et = (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(event_context)))->item_handler(event_context, item, event); + // et = (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(event_context)))->item_handler(event_context, item, event); ret = event_context->item_handler(item, event); if (!ret) { diff --git a/src/ui/tools/tool-base.h b/src/ui/tools/tool-base.h index 90fd69fae..a10c6177c 100644 --- a/src/ui/tools/tool-base.h +++ b/src/ui/tools/tool-base.h @@ -193,11 +193,11 @@ 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(GdkEvent* event); - virtual bool item_handler(SPItem* item, GdkEvent* event); + virtual bool root_handler(GdkEvent *event); + virtual bool item_handler(SPItem *item, GdkEvent *event); bool block_button(GdkEvent *event); - virtual const std::string& getPrefsPath() = 0; + virtual const std::string& getPrefsPath() = 0; /** * An observer that relays pref changes to the derived classes. @@ -236,7 +236,6 @@ protected: private: bool _keyboardMove(GdkEventKey const &event, Geom::Point const &dir); void sp_event_context_set_cursor(GdkCursorType cursor_type); - }; void sp_event_context_read(ToolBase *ec, gchar const *key); |
