Toolbar/breadcrumb fixes.

git-svn-id: http://svn.drobilla.net/lad/ingen@329 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 29 insertions, 28 deletions

diff --git a/src/progs/ingenuity/BreadCrumbBox.cpp b/src/progs/ingenuity/BreadCrumbBox.cpp
index 35fadfc6..a82a4325 100644
--- a/src/progs/ingenuity/BreadCrumbBox.cpp
+++ b/src/progs/ingenuity/BreadCrumbBox.cpp
@@ -40,7 +40,7 @@ BreadCrumbBox::view(const Path& path)
 }
 
 
-/** Sets up the crumbs to display a @a path.
+/** Sets up the crumbs to display @a path.
  *
  * If @a path is already part of the shown path, it will be selected and the 
  * children preserved.
diff --git a/src/progs/ingenuity/PatchWindow.cpp b/src/progs/ingenuity/PatchWindow.cpp
index d4e7f1cc..add0f16f 100644
--- a/src/progs/ingenuity/PatchWindow.cpp
+++ b/src/progs/ingenuity/PatchWindow.cpp
@@ -1,4 +1,5 @@
 /* This file is part of Ingen.
+			e< "\n\tcycle_start: " << _cycle_time.start_ticks()
  * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
  * 
  * Ingen is free software; you can redistribute it and/or modify it under the
@@ -161,29 +162,30 @@ PatchWindow::set_patch(SharedPtr<PatchModel> patch, SharedPtr<PatchView> view)
 
 	_patch = patch;
 
-	_view = _breadcrumb_box->view(patch->path());
+	_view = view;
+
+	if (!_view)
+		_view = _breadcrumb_box->view(patch->path());
 	
 	if (!_view)
 		_view = PatchView::create(patch);
-	else
-		assert(!view || _view == view);
 	
 	assert(_view);
 
-	// Add view to ourself
+	// Add view to our viewport
 	if (_view->get_parent())
-		_view->get_parent()->remove(*_view);
+		_view->get_parent()->remove(*_view.get());
 
 	_viewport->remove();
 	_viewport->add(*_view.get());
 
 
-	// Add our breadcrumbs to the view
 	if (_breadcrumb_box->get_parent())
 		_breadcrumb_box->get_parent()->remove(*_breadcrumb_box);
 
 	_view->breadcrumb_container()->remove();
 	_view->breadcrumb_container()->add(*_breadcrumb_box);
+	_view->breadcrumb_container()->show();
 
 	_breadcrumb_box->build(patch->path(), _view);
 	_breadcrumb_box->show();
diff --git a/src/progs/ingenuity/ingenuity.glade b/src/progs/ingenuity/ingenuity.glade
index afbe8c22..2381c687 100644
--- a/src/progs/ingenuity/ingenuity.glade
+++ b/src/progs/ingenuity/ingenuity.glade
@@ -1766,7 +1766,7 @@
 	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkToolbar" id="toolbar1">
+		<widget class="GtkToolbar" id="toolbar6">
 		  <property name="visible">True</property>
 		  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
 		  <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
@@ -1774,19 +1774,33 @@
 		  <property name="show_arrow">True</property>
 
 		  <child>
-		    <widget class="GtkToolItem" id="toolitem4">
+		    <widget class="GtkToolItem" id="patch_view_breadcrumb_toolitem">
 		      <property name="visible">True</property>
 		      <property name="visible_horizontal">True</property>
 		      <property name="visible_vertical">True</property>
 		      <property name="is_important">False</property>
 
 		      <child>
-			<widget class="GtkViewport" id="patch_view_breadcrumb_container">
+			<widget class="GtkAlignment" id="alignment4">
 			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xscale">1</property>
+			  <property name="yscale">1</property>
+			  <property name="top_padding">0</property>
+			  <property name="bottom_padding">0</property>
+			  <property name="left_padding">0</property>
+			  <property name="right_padding">0</property>
 
 			  <child>
-			    <placeholder/>
+			    <widget class="GtkViewport" id="patch_view_breadcrumb_container">
+			      <property name="visible">True</property>
+			      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+			      <child>
+				<placeholder/>
+			      </child>
+			    </widget>
 			  </child>
 			</widget>
 		      </child>
@@ -1796,24 +1810,9 @@
 		      <property name="homogeneous">False</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkToolbar" id="toolbar4">
-		  <property name="visible">True</property>
-		  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-		  <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
-		  <property name="tooltips">True</property>
-		  <property name="show_arrow">True</property>
 
 		  <child>
-		    <widget class="GtkToolItem" id="toolitem11">
+		    <widget class="GtkToolItem" id="toolitem14">
 		      <property name="visible">True</property>
 		      <property name="visible_horizontal">True</property>
 		      <property name="visible_vertical">True</property>