smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

fix editing of nested/group item colors in theme manager

Browse source
This commit is contained in:
Paul Davis 2014-12-15 15:54:10 -05:00
parent 0fdb846625
commit f8ae456aaa
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/theme_manager.cc
View file

@ -646,8 +646,10 @@ ThemeManager::setup_aliases ()
/* add as a child */ /* add as a child */
row = *(alias_list->append()); row = *(alias_list->append());
row[alias_columns.name] = i->first; row[alias_columns.name] = i->first;
row[alias_columns.key] = i->first;
} }
row[alias_columns.key] = i->first;
row[alias_columns.alias] = i->second; row[alias_columns.alias] = i->second;
Gdk::Color col; Gdk::Color col;
@ -682,8 +684,10 @@ ThemeManager::alias_button_press_event (GdkEventButton* ev)
case 1: /* color */ case 1: /* color */
if ((iter = alias_list->get_iter (path))) { if ((iter = alias_list->get_iter (path))) {
string target_color_name = (*iter)[alias_columns.name]; string target_color_alias = (*iter)[alias_columns.key];
choose_color_from_palette (target_color_name); if (!target_color_alias.empty()) {
choose_color_from_palette (target_color_alias);
}
} }
break; break;
} }

2
gtk2_ardour/theme_manager.h
View file

@ -134,11 +134,13 @@ class ThemeManager : public Gtk::VBox
add (name); add (name);
add (alias); add (alias);
add (color); add (color);
add (key);
} }
Gtk::TreeModelColumn<std::string> name; Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<std::string> alias; Gtk::TreeModelColumn<std::string> alias;
Gtk::TreeModelColumn<Gdk::Color> color; Gtk::TreeModelColumn<Gdk::Color> color;
Gtk::TreeModelColumn<std::string> key;
}; };
ColorAliasModelColumns alias_columns; ColorAliasModelColumns alias_columns;