diff options
Diffstat (limited to 'src/gui/MachinaCanvas.cpp')
-rw-r--r-- | src/gui/MachinaCanvas.cpp | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index a2bb2ac..3d01012 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -41,32 +41,37 @@ MachinaCanvas::MachinaCanvas(MachinaGUI* app, int width, int height) widget().grab_focus(); signal_event.connect( - sigc::mem_fun(this, &MachinaCanvas::on_event)); + sigc::mem_fun(this, &MachinaCanvas::on_event)); } bool MachinaCanvas::node_clicked(WeakPtr<NodeView> item, GdkEventButton* event) { SharedPtr<NodeView> node = PtrCast<NodeView>(item.lock()); - if (!node) + if (!node) { return false; + } - if (event->state & GDK_CONTROL_MASK) + if (event->state & GDK_CONTROL_MASK) { return false; + } - if (event->button == 2) { // Middle click: learn + if (event->button == 2) { + // Middle click: learn _app->controller()->learn(_app->maid(), node->node()->id()); return false; - } else if (event->button == 1) { // Left click: connect/disconnect + } else if (event->button == 1) { + // Left click: connect/disconnect SharedPtr<NodeView> last = _last_clicked.lock(); if (last) { if (node != last) { - if (get_edge(last.get(), node.get())) + if (get_edge(last.get(), node.get())) { action_disconnect(last, node); - else + } else { action_connect(last, node); + } } last->set_default_colors(); @@ -85,9 +90,9 @@ MachinaCanvas::node_clicked(WeakPtr<NodeView> item, GdkEventButton* event) bool MachinaCanvas::on_event(GdkEvent* event) { - if (event->type == GDK_BUTTON_RELEASE - && event->button.button == 3 - && !(event->button.state & (GDK_CONTROL_MASK))) { + if (( event->type == GDK_BUTTON_RELEASE) + && ( event->button.button == 3) + && !(event->button.state & (GDK_CONTROL_MASK))) { action_create_node(event->button.x, event->button.y); return true; @@ -110,16 +115,18 @@ MachinaCanvas::on_new_object(SharedPtr<Client::ClientObject> object) // view->set_base_color(0x101010FF); view->signal_clicked().connect( - sigc::bind<0>(sigc::mem_fun(this, &MachinaCanvas::node_clicked), - WeakPtr<NodeView>(view))); + sigc::bind<0>(sigc::mem_fun(this, &MachinaCanvas::node_clicked), + WeakPtr<NodeView>(view))); object->set_view(view); } else if (type.get<URIInt>() == uris.machina_Edge) { - SharedPtr<Machina::Client::ClientObject> tail = _app->client_model()->find( - object->get(uris.machina_tail_id).get_int32()); - SharedPtr<Machina::Client::ClientObject> head = _app->client_model()->find( - object->get(uris.machina_head_id).get_int32()); + SharedPtr<Machina::Client::ClientObject> tail + = _app->client_model()->find( + object->get(uris.machina_tail_id).get_int32()); + SharedPtr<Machina::Client::ClientObject> head + = _app->client_model()->find( + object->get(uris.machina_head_id).get_int32()); if (!tail || !head) { std::cerr << "Invalid arc" << std::endl; |