smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-27 15:38:19 +01:00
Code Issues Projects Releases Wiki Activity

Implement grid line colors ( was: measure lines ). This restores measure lines to a brighter color than beats.

Browse source
This commit is contained in:
Ben Loftis 2018-02-27 16:39:49 -06:00
parent d88cdcc1bf
commit e069b0c797
7 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/grid_lines.cc
View file

@ -58,13 +58,21 @@ GridLines::draw (std::vector<Ruler::Mark> marks)
{
lines.clear();
const uint32_t c = UIConfiguration::instance().color_mod("measure line beat", "measure line beat");
const uint32_t major_color = UIConfiguration::instance().color_mod("grid line major", "grid line");
const uint32_t minor_color = UIConfiguration::instance().color_mod("grid line minor", "grid line");
const uint32_t micro_color = UIConfiguration::instance().color_mod("grid line micro", "grid line");
for (vector<Ruler::Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) {
samplepos_t s = m->position;
lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, c);
if ((*m).style == ArdourCanvas::Ruler::Mark::Major) {
lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, major_color);
} else if ((*m).style == ArdourCanvas::Ruler::Mark::Minor) {
lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, minor_color);
} else {
lines.add (PublicEditor::instance().sample_to_pixel_unrounded (s), 1.0, micro_color);
}
}
}

8
gtk2_ardour/themes/blueberry_milk-ardour.colors
View file

@ -5,6 +5,7 @@
<Color name="color 10" value="0xe3dedeff"/>
<Color name="color 100" value="0xe49c9cff"/>
<Color name="color 101" value="0xa06000ff"/>
<Color name="color 102" value="0xa06000ff"/>
<Color name="color 103" value="0x1e7727ff"/>
<Color name="color 104" value="0x676767ff"/>
<Color name="color 11" value="0x9496a3ff"/>
@ -234,8 +235,9 @@
<ColorAlias name="master monitor section button active: fill" alias="color 40"/>
<ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
<ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
<ColorAlias name="measure line bar" alias="color 67"/>
<ColorAlias name="measure line beat" alias="color 81"/>
<ColorAlias name="grid line major" alias="color 67"/>
<ColorAlias name="grid line minor" alias="color 81"/>
<ColorAlias name="grid line micro" alias="color 81"/>
<ColorAlias name="meter background bottom" alias="color 67"/>
<ColorAlias name="meter background top" alias="color 67"/>
<ColorAlias name="meter bar" alias="color 7"/>
@ -501,7 +503,7 @@
<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
<Modifier name="loop rectangle" modifier="= alpha:0.5"/>
<Modifier name="marker bar" modifier="= alpha:0.5"/>
<Modifier name="measure line beat" modifier="= alpha:1"/>
<Modifier name="grid line alpha" modifier="= alpha:1"/>
<Modifier name="midi frame base" modifier="= alpha:0.814846"/>
<Modifier name="midi note" modifier="= alpha:0.8"/>
<Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

7
gtk2_ardour/themes/caineville-ardour.colors
View file

@ -171,6 +171,9 @@
<ColorAlias name="ghost track wave clip" alias="color 29"/>
<ColorAlias name="ghost track wave fill" alias="color 29"/>
<ColorAlias name="ghost track zero line" alias="color 30"/>
<ColorAlias name="grid line major" alias="color 13"/>
<ColorAlias name="grid line minor" alias="color 62"/>
<ColorAlias name="grid line micro" alias="color 62"/>
<ColorAlias name="gtk_arm" alias="color 9"/>
<ColorAlias name="gtk_audio_bus" alias="color 42"/>
<ColorAlias name="gtk_audio_track" alias="color 46"/>
@ -234,8 +237,6 @@
<ColorAlias name="master monitor section button active: fill" alias="color 40"/>
<ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
<ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
<ColorAlias name="measure line bar" alias="color 4"/>
<ColorAlias name="measure line beat" alias="color 94"/>
<ColorAlias name="meter background bottom" alias="color 4"/>
<ColorAlias name="meter background top" alias="color 4"/>
<ColorAlias name="meter bar" alias="color 7"/>
@ -493,10 +494,10 @@
<Modifier name="gain line inactive" modifier="= alpha:0.7725"/>
<Modifier name="ghost track base" modifier="= alpha:0.640782"/>
<Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
<Modifier name="grid line" modifier="= alpha:1.0"/>
<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
<Modifier name="loop rectangle" modifier="= alpha:0.5"/>
<Modifier name="marker bar" modifier="= alpha:0.5"/>
<Modifier name="measure line beat" modifier="= alpha:1"/>
<Modifier name="midi frame base" modifier="= alpha:0.720606"/>
<Modifier name="midi note" modifier="= alpha:0.8"/>
<Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

7
gtk2_ardour/themes/clear_gray-ardour.colors
View file

@ -170,6 +170,9 @@
<ColorAlias name="ghost track wave clip" alias="color 29"/>
<ColorAlias name="ghost track wave fill" alias="color 29"/>
<ColorAlias name="ghost track zero line" alias="color 30"/>
<ColorAlias name="grid line major" alias="color 13"/>
<ColorAlias name="grid line minor" alias="color 62"/>
<ColorAlias name="grid line micro" alias="color 62"/>
<ColorAlias name="gtk_arm" alias="color 13"/>
<ColorAlias name="gtk_audio_bus" alias="color 29"/>
<ColorAlias name="gtk_audio_track" alias="color 87"/>
@ -234,8 +237,6 @@
<ColorAlias name="master monitor section button active: fill" alias="color 40"/>
<ColorAlias name="master monitor section button active: fill active" alias="color 13"/>
<ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
<ColorAlias name="measure line bar" alias="color 4"/>
<ColorAlias name="measure line beat" alias="color 94"/>
<ColorAlias name="meter background bottom" alias="color 4"/>
<ColorAlias name="meter background top" alias="color 4"/>
<ColorAlias name="meter bar" alias="color 7"/>
@ -489,10 +490,10 @@
<Modifier name="gain line inactive" modifier="= alpha:0.7725"/>
<Modifier name="ghost track base" modifier="= alpha:0.640782"/>
<Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
<Modifier name="grid line" modifier="= alpha:1.0"/>
<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
<Modifier name="loop rectangle" modifier="= alpha:0.5"/>
<Modifier name="marker bar" modifier="= alpha:0.5"/>
<Modifier name="measure line beat" modifier="= alpha:1"/>
<Modifier name="midi frame base" modifier="= alpha:0.720606"/>
<Modifier name="midi note" modifier="= alpha:0.8"/>
<Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

7
gtk2_ardour/themes/cubasish-ardour.colors
View file

@ -171,6 +171,9 @@
<ColorAlias name="ghost track wave clip" alias="color 29"/>
<ColorAlias name="ghost track wave fill" alias="color 29"/>
<ColorAlias name="ghost track zero line" alias="color 30"/>
<ColorAlias name="grid line major" alias="color 13"/>
<ColorAlias name="grid line minor" alias="color 62"/>
<ColorAlias name="grid line micro" alias="color 62"/>
<ColorAlias name="gtk_arm" alias="color 9"/>
<ColorAlias name="gtk_audio_bus" alias="color 61"/>
<ColorAlias name="gtk_audio_track" alias="color 46"/>
@ -234,8 +237,6 @@
<ColorAlias name="master monitor section button active: fill" alias="color 40"/>
<ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
<ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
<ColorAlias name="measure line bar" alias="color 13"/>
<ColorAlias name="measure line beat" alias="color 33"/>
<ColorAlias name="meter background bottom" alias="color 4"/>
<ColorAlias name="meter background top" alias="color 4"/>
<ColorAlias name="meter bar" alias="color 7"/>
@ -493,10 +494,10 @@
<Modifier name="gain line inactive" modifier="= alpha:0.7725"/>
<Modifier name="ghost track base" modifier="= alpha:0.640782"/>
<Modifier name="ghost track midi fill" modifier="= alpha:0.182769"/>
<Modifier name="grid line" modifier="= alpha:1.0"/>
<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
<Modifier name="loop rectangle" modifier="= alpha:0.219904"/>
<Modifier name="marker bar" modifier="= alpha:0.5"/>
<Modifier name="measure line beat" modifier="= alpha:1"/>
<Modifier name="midi frame base" modifier="= alpha:0.817702"/>
<Modifier name="midi note" modifier="= alpha:0.863394"/>
<Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

7
gtk2_ardour/themes/dark-ardour.colors
View file

@ -236,8 +236,9 @@
<ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
<ColorAlias name="master monitor section button active: fill" alias="color 40"/>
<ColorAlias name="master monitor section button active: fill active" alias="color 54"/>
<ColorAlias name="measure line bar" alias="color 13"/>
<ColorAlias name="measure line beat" alias="color 62"/>
<ColorAlias name="grid line major" alias="color 13"/>
<ColorAlias name="grid line minor" alias="color 62"/>
<ColorAlias name="grid line micro" alias="color 62"/>
<ColorAlias name="meter background bottom" alias="color 46"/>
<ColorAlias name="meter background top" alias="color 34"/>
<ColorAlias name="meter bar" alias="color 7"/>
@ -519,7 +520,7 @@
<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
<Modifier name="loop rectangle" modifier="= alpha:0.5"/>
<Modifier name="marker bar" modifier="= alpha:0.5"/>
<Modifier name="measure line beat" modifier="= alpha:1.0"/>
<Modifier name="grid line" modifier="= alpha:1.0"/>
<Modifier name="midi frame base" modifier="= alpha:0.4"/>
<Modifier name="midi note" modifier="= alpha:0.8"/>
<Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>

7
gtk2_ardour/themes/unastudia-ardour.colors
View file

@ -176,6 +176,9 @@
<ColorAlias name="ghost track wave clip" alias="color 29"/>
<ColorAlias name="ghost track wave fill" alias="color 29"/>
<ColorAlias name="ghost track zero line" alias="color 30"/>
<ColorAlias name="grid line major" alias="color 13"/>
<ColorAlias name="grid line minor" alias="color 62"/>
<ColorAlias name="grid line micro" alias="color 62"/>
<ColorAlias name="gtk_arm" alias="color 2"/>
<ColorAlias name="gtk_audio_bus" alias="color 27"/>
<ColorAlias name="gtk_audio_track" alias="color 107"/>
@ -239,8 +242,6 @@
<ColorAlias name="master monitor section button active: fill" alias="color 42"/>
<ColorAlias name="master monitor section button active: fill active" alias="color 1"/>
<ColorAlias name="master monitor section button normal: fill active" alias="color 42"/>
<ColorAlias name="measure line bar" alias="color 105"/>
<ColorAlias name="measure line beat" alias="color 105"/>
<ColorAlias name="meter background bottom" alias="color 4"/>
<ColorAlias name="meter background top" alias="color 4"/>
<ColorAlias name="meter bar" alias="color 67"/>
@ -498,10 +499,10 @@
<Modifier name="gain line inactive" modifier="= alpha:0.782113"/>
<Modifier name="ghost track base" modifier="= alpha:0.640782"/>
<Modifier name="ghost track midi fill" modifier="= alpha:0.3"/>
<Modifier name="grid line" modifier="= alpha:1.0"/>
<Modifier name="inactive crossfade" modifier="= alpha:0.4666"/>
<Modifier name="loop rectangle" modifier="= alpha:0.3"/>
<Modifier name="marker bar" modifier="= alpha:0.5"/>
<Modifier name="measure line beat" modifier="= alpha:1"/>
<Modifier name="midi frame base" modifier="= alpha:0.4"/>
<Modifier name="midi note" modifier="= alpha:1"/>
<Modifier name="midi note velocity text" modifier="= alpha:0.4666"/>