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

Tapereel icon should follow fg_color, not use hardcoded red

Browse source
This commit is contained in:
Ben Loftis 2025-03-03 12:13:32 -06:00 • committed by Robin Gareus
parent 9636189d2a
commit ae56743b7d
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libs/widgets/ardour_icon.cc
View file

@ -1814,15 +1814,7 @@ static void icon_tape_reel (cairo_t *cr, const int width, const int height, cons
cairo_translate (cr, x, y); cairo_translate (cr, x, y);
cairo_arc (cr, 0, 0, r, 0, 2 * M_PI); cairo_arc (cr, 0, 0, r, 0, 2 * M_PI);
if (state == Gtkmm2ext::ExplicitActive) { Gtkmm2ext::set_source_rgba (cr, fg_color);
cairo_set_source_rgba (cr, .9, .3, .3, 1.0);
}
else if (state == Gtkmm2ext::ImplicitActive) {
Gtkmm2ext::set_source_rgba (cr, fg_color);
}
else {
Gtkmm2ext::set_source_rgba (cr, fg_color);
}
cairo_fill_preserve (cr); cairo_fill_preserve (cr);
if (is_dark (fg_color) && state == Gtkmm2ext::ExplicitActive) { if (is_dark (fg_color) && state == Gtkmm2ext::ExplicitActive) {
@ -1866,15 +1858,7 @@ static void icon_tape_reel (cairo_t *cr, const int width, const int height, cons
cairo_restore (cr); cairo_restore (cr);
cairo_arc (cr, 0, 0, r * .3, 0, 2 * M_PI); cairo_arc (cr, 0, 0, r * .3, 0, 2 * M_PI);
if (state == Gtkmm2ext::ExplicitActive) { Gtkmm2ext::set_source_rgba (cr, fg_color);
cairo_set_source_rgba (cr, .9, .3, .3, 1.0);
}
else if (state == Gtkmm2ext::ImplicitActive) {
Gtkmm2ext::set_source_rgba (cr, fg_color);
}
else {
Gtkmm2ext::set_source_rgba (cr, fg_color);
}
cairo_fill (cr); cairo_fill (cr);
cairo_set_source_rgba (cr, .0, .0, .0, 1.0); cairo_set_source_rgba (cr, .0, .0, .0, 1.0);
cairo_arc (cr, 0, 0, r *.15, 0, 2 * M_PI); // hole in the middle cairo_arc (cr, 0, 0, r *.15, 0, 2 * M_PI); // hole in the middle

2
tools/icons/icon.cc
View file

@ -209,8 +209,6 @@ main (int argc, char** argv)
draw_icon (cr, pos++, ArdourIcon::RecButton, Gtkmm2ext::Off); draw_icon (cr, pos++, ArdourIcon::RecButton, Gtkmm2ext::Off);
draw_icon (cr, pos++, ArdourIcon::RecButton, Gtkmm2ext::ImplicitActive); draw_icon (cr, pos++, ArdourIcon::RecButton, Gtkmm2ext::ImplicitActive);
draw_icon (cr, pos++, ArdourIcon::TapeReel, Gtkmm2ext::Off);
draw_icon (cr, pos++, ArdourIcon::TapeReel, Gtkmm2ext::ImplicitActive);
for (int i = 0; i < ArdourIcon::NoIcon; ++i) { for (int i = 0; i < ArdourIcon::NoIcon; ++i) {
draw_icon (cr, pos++, ArdourIcon::Icon (i), Gtkmm2ext::ExplicitActive); draw_icon (cr, pos++, ArdourIcon::Icon (i), Gtkmm2ext::ExplicitActive);