diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/EdgeView.cpp | 2 | ||||
-rw-r--r-- | src/gui/MachinaCanvas.cpp | 1 | ||||
-rw-r--r-- | src/gui/MachinaCanvas.hpp | 3 | ||||
-rw-r--r-- | src/gui/NodeView.cpp | 25 |
4 files changed, 6 insertions, 25 deletions
diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp index 0767ace..f8dedbd 100644 --- a/src/gui/EdgeView.cpp +++ b/src/gui/EdgeView.cpp @@ -70,7 +70,7 @@ EdgeView::EdgeView(Canvas& canvas, , _edge(edge) { set_color(edge_color(probability())); - show_handle(true, HANDLE_CIRCLE); + show_handle(true); edge->signal_property.connect( sigc::mem_fun(this, &EdgeView::on_property)); diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index 18d0196..15a8a4a 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -38,7 +38,6 @@ using namespace Machina; MachinaCanvas::MachinaCanvas(MachinaGUI* app, int width, int height) : Canvas(width, height) , _app(app) - , _selector_dash(NULL) { grab_focus(); } diff --git a/src/gui/MachinaCanvas.hpp b/src/gui/MachinaCanvas.hpp index 79a381c..671f5d9 100644 --- a/src/gui/MachinaCanvas.hpp +++ b/src/gui/MachinaCanvas.hpp @@ -41,8 +41,6 @@ public: void on_new_object(SharedPtr<Machina::Client::ClientObject> object); void on_erase_object(SharedPtr<Machina::Client::ClientObject> object); - ArtVpathDash* selector_dash() { return _selector_dash; } - MachinaGUI* app() { return _app; } protected: @@ -62,7 +60,6 @@ private: SharedPtr<NodeView> port2); MachinaGUI* _app; - ArtVpathDash* _selector_dash; WeakPtr<NodeView> _last_clicked; }; diff --git a/src/gui/NodeView.cpp b/src/gui/NodeView.cpp index e417ffa..77ccd4d 100644 --- a/src/gui/NodeView.cpp +++ b/src/gui/NodeView.cpp @@ -108,29 +108,13 @@ NodeView::show_label(bool show) set_name(""); } -/// Dash style for selector node outlines -static ArtVpathDash* -selector_dash() -{ - static ArtVpathDash* selector_dash = NULL; - - if (!selector_dash) { - selector_dash = new ArtVpathDash(); - selector_dash->n_dash = 2; - selector_dash->dash = art_new(double, 2); - selector_dash->dash[0] = 8; - selector_dash->dash[1] = 8; - } - - return selector_dash; -} - void NodeView::set_selected(bool selected) { Ellipse::set_selected(selected); - if (!selected) - _ellipse.property_dash() = node_is(URIs::instance().machina_selector) ? selector_dash() : 0; + std::cerr << "FIXME: dash" << std::endl; + //if (!selected) + // _ellipse.property_dash() = node_is(URIs::instance().machina_selector) ? selector_dash() : 0; } void @@ -140,7 +124,8 @@ NodeView::on_property(Machina::URIInt key, const Raul::Atom& value) static const uint32_t active_border_color = 0x00FF00FF; if (key == URIs::instance().machina_selector) { - _ellipse.property_dash() = value.get_bool() ? selector_dash() : 0; + //_ellipse.property_dash() = value.get_bool() ? selector_dash() : 0; + std::cerr << "FIXME: dash" << std::endl; } else if (key == URIs::instance().machina_initial) { set_border_width(value.get_bool() ? 4.0 : 1.0); } else if (key == URIs::instance().machina_active) { |