summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-08-20 16:58:57 +0000
committerDavid Robillard <d@drobilla.net>2011-08-20 16:58:57 +0000
commitc2d440f132983a1068caa23e6c3832ddecbabaa9 (patch)
tree31ac22da85bca76220f84f9d8a489c097106f1c3
parent93fa6b70cb13c445a23c75c565d31fe7ddbe02cc (diff)
downloadingen-c2d440f132983a1068caa23e6c3832ddecbabaa9.tar.gz
ingen-c2d440f132983a1068caa23e6c3832ddecbabaa9.tar.bz2
ingen-c2d440f132983a1068caa23e6c3832ddecbabaa9.zip
Fix node control windows (ticket #733).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3435 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/gui/ControlPanel.cpp7
-rw-r--r--src/gui/NodeControlWindow.cpp3
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/ControlPanel.cpp b/src/gui/ControlPanel.cpp
index 4dbb9ba0..00ae05c8 100644
--- a/src/gui/ControlPanel.cpp
+++ b/src/gui/ControlPanel.cpp
@@ -87,19 +87,18 @@ ControlPanel::add_port(SharedPtr<const PortModel> pm)
// Add port
if (pm->is_input()) {
- Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create("warehouse_win");
if (pm->is_toggle()) {
ToggleControl* tc;
- xml->get_widget_derived("toggle_control", tc);
+ WidgetFactory::get_widget_derived("toggle_control", tc);
control = tc;
} else if (pm->is_a(PortType::CONTROL)
|| pm->supports(App::instance().uris().atom_Float32)) {
SliderControl* sc;
- xml->get_widget_derived("control_strip", sc);
+ WidgetFactory::get_widget_derived("control_strip", sc);
control = sc;
} else if (pm->supports(App::instance().uris().atom_String)) {
StringControl* sc;
- xml->get_widget_derived("string_control", sc);
+ WidgetFactory::get_widget_derived("string_control", sc);
control = sc;
}
}
diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp
index 29ea2267..4fac3177 100644
--- a/src/gui/NodeControlWindow.cpp
+++ b/src/gui/NodeControlWindow.cpp
@@ -47,7 +47,8 @@ NodeControlWindow::NodeControlWindow(SharedPtr<const NodeModel> node,
set_title(_node->plugin_model()->human_name() + " - Ingen");
- WidgetFactory::get_widget_derived("control_panel_vbox", _control_panel);
+ Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create("warehouse_win");
+ xml->get_widget_derived("control_panel_vbox", _control_panel);
show_all_children();