Chris's work on the region list

git-svn-id: svn://localhost/ardour2/branches/3.0@4920 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index c50ff71e274a17c4dc4c778adf74c17a42f26e1d..6a92cc7819d33194181251518a20424115852d89 100644 (file)
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -854,6 +854,7 @@ style "edit_group_3"
 style "treeview_parent_node"
 {
        # specifies *just* the color used for whole file rows when not selected
+       
        fg[NORMAL] = { 0.0, 0.6, 0.85 }
 }
 
@@ -862,28 +863,28 @@ style "treeview_display" = "small_bold_text"
        GtkWidget::focus-line-width = 0
 
        # expander arrow border and DnD "icon" text
-       #fg[NORMAL] = { 0.8, 0.8, 0.8 } 
+       fg[NORMAL] = { 0.8, 0.8, 0.8 } 
 
        bg[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 }
+       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 }    
+       base[ACTIVE] = { 0.0, 0.75, 0.75 }    
 
        # selected row bg when window has focus
-       #base[SELECTED] = { 0, 0.75, 0.75 }
+       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 }
+       text[NORMAL] = { 0.80, 0.80, 0.80 }
 
        # selected row text with window focus
-       #text[SELECTED] = { 0, 1.0, 1.0 }  
+       text[SELECTED] = { 1.0, 1.0, 1.0 }  
 
        # selected row text without window focus (including during DnD)
-       #text[ACTIVE] = { 0, 1.0, 1.0 }  
+       text[ACTIVE] = { 1.0, 1.0, 1.0 }  
 }
 
 style "main_canvas_area"

diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index 338dc71221763678340ce037c9878c952f11662d..7e9fb810d851f9d6dfb62fc1dc2cad5f6a2e83d1 100644 (file)
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -177,7 +177,7 @@ Editor::add_region_to_region_display (boost::shared_ptr<Region> region)
                        foo << region->n_channels ();
                        str += " [";
                        str += foo.str();
-                       str += ']';
+                       str += "]";
                }
 
                row[region_list_columns.name] = str;
@@ -236,7 +236,7 @@ Editor::add_region_to_region_display (boost::shared_ptr<Region> region)
        
        row[region_list_columns.region] = region;
        
-       populate_row(region, row);
+       populate_row(region, (*row));
 }
 
 
@@ -328,7 +328,7 @@ Editor::set_selected_in_region_list(RegionSelection& regions)
                        boost::shared_ptr<Region> compared_region = (*i)[region_list_columns.region];
 
                        if (r == compared_region) {
-                               region_list_display.get_selection()->select(*i);;
+                               region_list_display.get_selection()->select(*i);
                                break;
                        }
                        
@@ -352,12 +352,12 @@ Editor::set_selected_in_region_list_subrow (boost::shared_ptr<Region> region, Tr
                boost::shared_ptr<Region> compared_region = (*i)[region_list_columns.region];
                
                if (region == compared_region) {
-                       region_list_display.get_selection()->select(*i);;
+                       region_list_display.get_selection()->select(*i);
                        return true;
                }
                
                if (!(*i).children().empty()) {
-                       if (update_region_subrows(region, (*i), level + 1)) {
+                       if (set_selected_in_region_list_subrow(region, (*i), level + 1)) {
                                return true;
                        }
                }
@@ -704,9 +704,9 @@ Editor::populate_row (boost::shared_ptr<Region> region, TreeModel::Row const &ro
                row[region_list_columns.start] = start_str;
                row[region_list_columns.end] = end_str;
                
-               if (region->sync_position() == region->position()) {
+               if (region->sync_position() == 0) {
                        row[region_list_columns.sync] = _("Start");
-               } else if (region->sync_position() == (region->position() + region->length() - 1)) {
+               } else if (region->sync_position() == region->length() - 1) {
                        row[region_list_columns.sync] = _("End");
                } else {
                        row[region_list_columns.sync] = sync_str;