Merged with trunk R1327.

git-svn-id: svn://localhost/ardour2/branches/midi@1328 d708f5d6-7413-0410-9779-e7cbd77b26cf

12 files changed, 158 insertions, 113 deletions

diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index 097c72f6d8..456859162f 100644
--- a/gtk2_ardour/ardour.colors
+++ b/gtk2_ardour/ardour.colors
@@ -68,8 +68,8 @@ cEnteredAutomationLine 0.87 0.39 0.39 1.00
 cEnteredMarker 0.87 0.39 0.39 1.00
 cMeterMarker 0.95 0.26 0.36 1.00
 cTempoMarker 0.95 0.26 0.36 1.00
-cMeasureLineBeat 0.40 0.40 0.40 0.50
-cMeasureLineBar 0.55 0.55 0.60 0.70
+cMeasureLineBeat 0.45 0.45 0.45 0.40
+cMeasureLineBar 0.55 0.55 0.60 0.55
 cGhostTrackBaseOutline 0.00 0.00 0.00 1.00
 cGhostTrackBaseFill 0.27 0.00 0.49 0.50
 cImageTrackBase 0.87 0.87 0.85 1.00
diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index 249edddbf4..a450e6d7dc 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -676,27 +676,44 @@ style "edit_group_3"
 	bg[SELECTED] = { 0.93, 0.34, 0.08 }
 }
 
-style "region_list_display" = "small_bold_text"
+style "treeview_parent_node"
 {
-	fg[NORMAL] = { 0.80, 0.80, 0.80 }
-	fg[ACTIVE] = { 0.80, 0.80, 0.80 }
-	fg[SELECTED] = { 0.70, 0.70, 0.70 }
-	bg[NORMAL] = { 0, 0, 0 }
-	bg[ACTIVE] = { 0, 0, 0 }
-	bg[SELECTED] = { 0, 0, 0 }
-	base[NORMAL] = { 0, 0, 0 }
- 	base[ACTIVE] = { 0, 1, 0 }
- 	base[INSENSITIVE] = { 0, 0, 0 }
- 	base[SELECTED] = { 0.80, 0.80, 0.80 }
+	# specifies *just* the color used for whole file rows when not selected
+	fg[NORMAL] = { 0.0, 0.6, 0.85 }
+}
+
+style "treeview_display" = "small_bold_text"
+{
+	# expander arrow border and DnD "icon" text
+	fg[NORMAL] = { 0.8, 0.8, 0.8 } 
+
+	# background with no rows or no selection, plus
+	# expander arrow core and DnD "icon" background
+	base[NORMAL] = { 0.20, 0.20, 0.25 }
+
+	# selected row bg when window does not have focus (including during DnD)
+ 	base[ACTIVE] = { 0.0, 0.60, 0.60 }    
+
+	# selected row bg when window has focus
+ 	base[SELECTED] = { 0, 0.75, 0.75 }
+
+	# row text when in normal state and not a parent
+	text[NORMAL] = { 0.80, 0.80, 0.80 }
+
+	# selected row text with window focus
+	text[SELECTED] = { 0, 1.0, 1.0 }  
+
+	# selected row text without window focus (including during DnD)
+	text[ACTIVE] = { 0, 1.0, 1.0 }  
 }
 
 style "main_canvas_area"
 {
-	bg[NORMAL] = { 0.20, 0.20, 0.25 }
-	bg[ACTIVE] = { 0.20, 0.20, 0.25 }
-	bg[INSENSITIVE] = { 0.20, 0.20, 0.25 }
-	bg[SELECTED] = { 0.20, 0.20, 0.25 }
-	bg[PRELIGHT] = { 0.20, 0.20, 0.25 }
+	bg[NORMAL] = { 0.30, 0.30, 0.34 }
+	bg[ACTIVE] = { 0.30, 0.30, 0.34 }
+	bg[INSENSITIVE] = { 0.30, 0.30, 0.34 }
+	bg[SELECTED] = { 0.30, 0.30, 0.34 }
+	bg[PRELIGHT] = { 0.30, 0.30, 0.34 }
 }
 
 style "track_controls_inactive"
@@ -999,11 +1016,6 @@ style "pan_slider"
 
 }
 
-style "region_list_whole_file"
-{
-	fg[NORMAL] = { 0.4, 0.4, 0.9 }
-}
-
 style "ardour_button" ="default_buttons_menus"
 {
 	xthickness = 1
@@ -1189,7 +1201,6 @@ widget "*EditorTrackNameDisplay" style "track_name_display"
 widget "*EditorTrackNameDisplay*" style "track_name_display"
 widget "*EditorActiveTrackNameDisplay" style "active_track_name_display"
 widget "*EditorActiveTrackNameDisplay*" style "active_track_name_display"
-widget "*EditorRegionList" style "region_list_display"
 widget "*CrossfadeEditAuditionButton" style "red_when_active"
 widget "*CrossfadeEditAuditionButton*" style "red_when_active"
 widget "*CrossfadeEditCurveButton" style "red_when_active"
@@ -1221,19 +1232,19 @@ widget "*ParameterValueDisplay" style "medium_bold_entry"
 widget "*PluginUIClickBox" style "medium_bold_entry"
 widget "*PluginUIClickBox*" style "medium_bold_entry"
 widget "*PluginSlider" style "plugin_slider"
-widget "*TrackListDisplay" style "track_list_display"
-widget "*TrackListDisplay.*" style "small_bold_text"
-widget "*EditGroupList" style "track_list_display"
-widget "*RegionListDisplay" style "small_bold_entry"
-widget "*RegionListDisplay.*" style "small_bold_text"
 widget "*RedirectSelector" style "redirect_list_display"
 widget "*RedirectSelector.*" style "redirect_list_display"
+widget "*EditGroupDisplay" style "treeview_display"
+widget "*TrackListDisplay" style "treeview_display"
+widget "*RegionListDisplay" style "treeview_display"
+widget "*NamedSelectionDisplay" style "treeview_display"
+widget "*SnapshotDisplay" style "treeview_display"
 widget "*MixerTrackCommentArea" style "option_entry"
 widget "*MixerPanZone" style "pan_zone"
-widget "*MixerTrackDisplayList" style "track_list_display"
-widget "*MixerSnapshotDisplayList" style "track_list_display"
-widget "*MixerAuxDisplayList" style "track_list_display"
-widget "*MixerGroupList" style "track_list_display"
+widget "*MixerTrackDisplayList" style "treeview_display"
+widget "*MixerSnapshotDisplayList" style "treeview_display"
+widget "*MixerAuxDisplayList" style "treeview_display"
+widget "*MixerGroupList" style "treeview_display"
 widget "*RegionEditorLabel" style "medium_text"
 widget "*RegionEditorSmallLabel" style "small_text"
 widget "*RegionEditorEntry" style "medium_entry"
@@ -1360,7 +1371,7 @@ widget "*PanningLinkDirectionButton" style "very_small_button"
 widget "*PanningLinkDirectionButton.*" style "very_small_button"
 widget "*ChannelCountSelector" style "medium_bold_entry"
 widget "*ChannelCountSelector.GtkArrow" style "default_buttons_menus"
-widget "*RegionListWholeFile" style "region_list_whole_file"
+widget "*RegionListWholeFile" style "treeview_parent_node"
 
 class "GtkWidget" style "default_base"
 class "GtkScrollbar" style "ardour_adjusters"
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 77c731178c..c7c72dff2c 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -504,12 +504,11 @@ Editor::Editor (AudioEngine& eng)
 	active_cell->property_activatable() = true;
 	active_cell->property_radio() = false;
 
-	edit_group_display.set_name ("EditGroupList");
-
 	group_model->signal_row_changed().connect (mem_fun (*this, &Editor::edit_group_row_change));
 
 	edit_group_display.set_name ("EditGroupList");
 	edit_group_display.get_selection()->set_mode (SELECTION_SINGLE);
+	edit_group_display.set_headers_visible (false);
 	edit_group_display.set_reorderable (false);
 	edit_group_display.set_rules_hint (true);
 	edit_group_display.set_size_request (75, -1);
@@ -595,11 +594,12 @@ Editor::Editor (AudioEngine& eng)
 	named_selection_display.append_column (_("Chunks"), named_selection_columns.text);
 	named_selection_display.set_headers_visible (false);
 	named_selection_display.set_size_request (100, -1);
-	named_selection_display.set_name ("RegionListDisplay");
+	named_selection_display.set_name ("NamedSelectionDisplay");
 	
 	named_selection_display.get_selection()->set_mode (SELECTION_SINGLE);
 	named_selection_display.set_size_request (100, -1);
-	named_selection_display.signal_button_release_event().connect (mem_fun(*this, &Editor::named_selection_display_button_press), false);
+	named_selection_display.signal_button_release_event().connect (mem_fun(*this, &Editor::named_selection_display_button_release), false);
+	named_selection_display.signal_key_release_event().connect (mem_fun(*this, &Editor::named_selection_display_key_release), false);
 	named_selection_display.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::named_selection_display_selection_changed));
 
 	/* SNAPSHOTS */
@@ -607,7 +607,7 @@ Editor::Editor (AudioEngine& eng)
 	snapshot_display_model = ListStore::create (snapshot_display_columns);
 	snapshot_display.set_model (snapshot_display_model);
 	snapshot_display.append_column (X_("snapshot"), snapshot_display_columns.visible_name);
-	snapshot_display.set_name ("SnapshotDisplayList");
+	snapshot_display.set_name ("SnapshotDisplay");
 	snapshot_display.set_size_request (75, -1);
 	snapshot_display.set_headers_visible (false);
 	snapshot_display.set_reorderable (false);
@@ -1773,7 +1773,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
 	items.push_back (MenuElem (_("Crop region to range"), mem_fun(*this, &Editor::crop_region_to_selection)));
 	items.push_back (MenuElem (_("Fill range with region"), mem_fun(*this, &Editor::region_fill_selection)));
 	items.push_back (MenuElem (_("Duplicate range"), bind (mem_fun(*this, &Editor::duplicate_dialog), false)));
-	items.push_back (MenuElem (_("Create chunk from range"), mem_fun(*this, &Editor::name_selection)));
+	items.push_back (MenuElem (_("Create chunk from range"), mem_fun(*this, &Editor::create_named_selection)));
 	items.push_back (SeparatorElem());
 	items.push_back (MenuElem (_("Bounce range"), mem_fun(*this, &Editor::bounce_range_selection)));
 	items.push_back (MenuElem (_("Export range"), mem_fun(*this, &Editor::export_selection)));
@@ -4020,15 +4020,16 @@ Editor::redisplay_snapshots ()
 		string statename = *(*i);
 		TreeModel::Row row = *(snapshot_display_model->append());
 		
-		// we don't have a way of changing the rendering in just one TreeView 
-		// cell so just put an asterisk on each side of the name for now.
+		/* this lingers on in case we ever want to change the visible
+		   name of the snapshot.
+		*/
+		
 		string display_name;
+		display_name = statename;
+
 		if (statename == session->snap_name()) {
-			display_name = "*"+statename+"*";
 			snapshot_display.get_selection()->select(row);
-		} else {
-			display_name = statename;
-		}
+		} 
 		
 		row[snapshot_display_columns.visible_name] = display_name;
 		row[snapshot_display_columns.real_name] = statename;
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index c3c77c553b..80fa2ff4df 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -788,16 +788,16 @@ class Editor : public PublicEditor
 	Gtkmm2ext::DnDTreeView<ARDOUR::NamedSelection*> named_selection_display;
 	Gtk::ScrolledWindow    named_selection_scroller;
 
-	void name_selection();
-	void named_selection_name_chosen ();
-	void create_named_selection (const string &);
+	void create_named_selection ();
 	void paste_named_selection (float times);
+	void remove_selected_named_selections ();
 
 	void handle_new_named_selection ();
 	void add_named_selection_to_named_selection_display (ARDOUR::NamedSelection&);
 	void redisplay_named_selections ();
 
-	gint named_selection_display_button_press (GdkEventButton *ev);
+	bool named_selection_display_button_release (GdkEventButton *ev);
+	bool named_selection_display_key_release (GdkEventKey *ev);
 	void named_selection_display_selection_changed ();
 
 	/* track views */
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index 8139e91ca7..bdb934e8e0 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -282,11 +282,21 @@ Editor::session_going_away ()
 
 	/* rip everything out of the list displays */
 
-	region_list_clear (); // no clear() method in gtkmm 1.2 
+	region_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+	route_list_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+	named_selection_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+	edit_group_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
+
+	region_list_model->clear ();
 	route_display_model->clear ();
 	named_selection_model->clear ();
 	group_model->clear ();
 
+	region_list_display.set_model (region_list_model);
+	route_list_display.set_model (route_display_model);
+	named_selection_display.set_model (named_selection_model);
+	edit_group_display.set_model (group_model);
+
 	edit_cursor_clock.set_session (0);
 	zoom_range_clock.set_session (0);
 	nudge_clock.set_session (0);
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index fc76c6a43c..01ea203c61 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2800,7 +2800,6 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 		set<boost::shared_ptr<Playlist> > affected_playlists;
 		pair<set<boost::shared_ptr<Playlist> >::iterator,bool> insert_result;
 		
-		// TODO: Crossfades need to be copied!
 		for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
 			RegionView* rv;
 			
@@ -2808,7 +2807,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 			
 			boost::shared_ptr<Playlist> to_playlist = rv->region()->playlist();
 			RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&rv->get_time_axis_view());
-			
+
 			insert_result = affected_playlists.insert (to_playlist);
 			if (insert_result.second) {
 				session->add_command (new MementoCommand<Playlist>(*to_playlist, &to_playlist->get_state(), 0));
@@ -3223,7 +3222,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 			/* hide any dependent views */
 
-//			rv->get_time_axis_view().hide_dependent_views (*rv);
+			rv->get_time_axis_view().hide_dependent_views (*rv);
 				
 			/* this is subtle. raising the regionview itself won't help,
 			   because raise_to_top() just puts the item on the top of
diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index bc95cb0d14..97512c06e8 100644
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -50,7 +50,8 @@ using namespace Editing;
 void
 Editor::handle_region_removed (boost::weak_ptr<Region> wregion)
 {
-	ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::handle_region_removed), wregion));
+	cerr << "removed region\n";
+	ENSURE_GUI_THREAD (mem_fun (*this, &Editor::redisplay_regions));
 	redisplay_regions ();
 }
 
@@ -256,12 +257,6 @@ Editor::redisplay_regions ()
 }
 
 void
-Editor::region_list_clear ()
-{
-	region_list_model->clear();
-}
-
-void
 Editor::build_region_list_menu ()
 {
 	region_list_menu = dynamic_cast<Menu*>(ActionManager::get_widget ("/RegionListMenu"));
@@ -562,6 +557,7 @@ Editor::hide_a_region (boost::shared_ptr<Region> r)
 void
 Editor::remove_a_region (boost::shared_ptr<Region> r)
 {
+	cerr << "remove " << r->name();
 	session->remove_region_from_region_list (r);
 }
 
@@ -580,6 +576,7 @@ Editor::hide_region_from_region_list ()
 void
 Editor::remove_region_from_region_list ()
 {
+	cerr << "Mapping remove over region selection\n";
 	region_list_selection_mapover (mem_fun (*this, &Editor::remove_a_region));
 }
 
diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc
index 8e88ee497b..864e527b59 100644
--- a/gtk2_ardour/editor_selection_list.cc
+++ b/gtk2_ardour/editor_selection_list.cc
@@ -65,10 +65,48 @@ Editor::redisplay_named_selections ()
 	session->foreach_named_selection (*this, &Editor::add_named_selection_to_named_selection_display);
 }
 
-gint
-Editor::named_selection_display_button_press (GdkEventButton *ev)
+bool
+Editor::named_selection_display_key_release (GdkEventKey* ev)
 {
+	if (session == 0) {
+		return true;
+	}
+
+	switch (ev->keyval) {
+	case GDK_Delete:
+		remove_selected_named_selections ();
+		return true;
+		break;
+	default:
+		return false;
+		break;
+	}
+
+}
+
+void
+Editor::remove_selected_named_selections ()
+{
+	Glib::RefPtr<TreeSelection> selection = named_selection_display.get_selection();
+	TreeView::Selection::ListHandle_Path rows = selection->get_selected_rows ();
+
+	if (selection->count_selected_rows() == 0) {
+		return;
+	}
+
+	for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) {
+
+		TreeIter iter;
 
+		if ((iter = named_selection_model->get_iter (*i))) {
+			session->remove_named_selection ((*iter)[named_selection_columns.selection]);
+		}
+	}
+}
+
+bool
+Editor::named_selection_display_button_release (GdkEventButton *ev)
+{
 	TreeModel::Children rows = named_selection_model->children();
 	TreeModel::Children::iterator i;
 	Glib::RefPtr<TreeSelection> selection = named_selection_display.get_selection();
@@ -91,7 +129,8 @@ Editor::named_selection_display_button_press (GdkEventButton *ev)
 			}
 		}
 	}
-	return FALSE;
+
+	return false;
 }
 
 
@@ -101,37 +140,10 @@ Editor::named_selection_display_selection_changed ()
 }
 
 void
-Editor::name_selection ()
+Editor::create_named_selection ()
 {
-	ArdourPrompter p;
-
-	p.set_prompt (_("Name for Chunk:"));
-	p.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
-	p.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
-	p.change_labels (_("Create Chunk"), _("Forget it"));
-	p.show_all ();
-
-	switch (p.run ()) {
-	case Gtk::RESPONSE_ACCEPT:
-	  string name;
-		p.get_result (name);
-		if (name.length()) {
-		  create_named_selection (name);
-		}	
-		break;
-	}
+	string name;
 
-}
-
-void
-Editor::named_selection_name_chosen ()
-{
-	Gtk::Main::quit ();
-}
-
-void
-Editor::create_named_selection (const string & name)
-{
 	if (session == 0) {
 		return;
 	}
@@ -141,7 +153,6 @@ Editor::create_named_selection (const string & name)
 	if (selection->time.empty()) {
 		return;
 	}
-
 	
 	TrackViewList *views = get_valid_views (selection->time.track, selection->time.group);
 
@@ -157,25 +168,42 @@ Editor::create_named_selection (const string & name)
 		
 		boost::shared_ptr<Playlist> pl = (*i)->playlist();
 		
-		if (pl) {
-			
-			if ((what_we_found = pl->copy (selection->time, false)) != 0) {
-
-				thelist.push_back (what_we_found);
-			}
+		if (pl && (what_we_found = pl->copy (selection->time, false)) != 0) {
+			thelist.push_back (what_we_found);
 		}
 	}
 
-	NamedSelection* ns;
-	TreeModel::Row row = *(named_selection_model->append());
-
-	ns = new NamedSelection (name, thelist);
-	row[named_selection_columns.selection] = ns;
-	row[named_selection_columns.text] = name;
+	if (!thelist.empty()) {
 
-	/* make the one we just added be selected */
+		ArdourPrompter p;
+		
+		p.set_prompt (_("Name for Chunk:"));
+		p.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
+		p.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
+		p.change_labels (_("Create Chunk"), _("Forget it"));
+		p.show_all ();
+		
+		switch (p.run ()) {
+			
+		case Gtk::RESPONSE_ACCEPT:
+			p.get_result (name);
+			if (name.empty()) {
+				return;
+			}	
+			break;
+		default:
+			return;
+		}
 
-	named_selection_display.get_selection()->select (row);
+		new NamedSelection (name, thelist); // creation will add it to the model
 
+		/* make the one we just added be selected */
+		
+		TreeModel::Children::iterator added = named_selection_model->children().end();
+		--added;
+		named_selection_display.get_selection()->select (*added);
+	} else {
+		error << _("No selectable material found in the currently selected time range") << endmsg;
+	}
 }
 
diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index d02c5a88de..ddb771bb18 100644
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -88,7 +88,6 @@ PlaylistSelector::clear_map ()
 bool
 PlaylistSelector::on_unmap_event (GdkEventAny* ev)
 {
-	cerr << "PLselector unmapped\n";
 	clear_map ();
 	if (model) {
 		model->clear ();
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index a9315bb76f..aff5866c8d 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -367,9 +367,9 @@ void
 RegionView::set_frame_color ()
 {
 	if (_region->opaque()) {
-		fill_opacity = 230;
+		fill_opacity = 130;
 	} else {
-		fill_opacity = 100;
+		fill_opacity = 60;
 	}
 
 	TimeAxisViewItem::set_frame_color ();
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 070ad42037..e7fa77f4da 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -446,7 +446,7 @@ RouteUI::refresh_remote_control_menu ()
 
 	RadioMenuItem::Group rc_group;
 	CheckMenuItem* rc_active;
-	uint32_t limit = _session.ntracks();
+	uint32_t limit = _session.ntracks() + _session.nbusses();
 	char buf[32];
 
 	MenuList& rc_items = remote_control_menu->items();
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 6af38deaee..a008e2af1a 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -102,7 +102,7 @@ TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group&
 	frame_position = start ;
 	item_duration = duration ;
 	name_connected = false;
-	fill_opacity = 230;
+	fill_opacity = 130;
 	position_locked = false ;
 	max_item_duration = ARDOUR::max_frames;
 	min_item_duration = 0 ;