From 5c3f49ef2bab72787da590d0790e81c717bc8eac Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 23 Mar 2020 01:18:55 +0100 Subject: [PATCH] Fix icon-tool tape-rec icon was removed in a4d7b45fe, also re-order icons to retain grouping per line when using the icon render util --- libs/widgets/widgets/ardour_icon.h | 6 +++--- tools/icons/icon.cc | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libs/widgets/widgets/ardour_icon.h b/libs/widgets/widgets/ardour_icon.h index 81e2d47424..441135e20a 100644 --- a/libs/widgets/widgets/ardour_icon.h +++ b/libs/widgets/widgets/ardour_icon.h @@ -28,6 +28,9 @@ namespace ArdourWidgets { namespace ArdourIcon { enum Icon { RecButton, + ZoomIn, + ZoomOut, + ZoomFull, TransportPanic, TransportStop, TransportPlay, @@ -43,9 +46,6 @@ namespace ArdourWidgets { namespace ArdourIcon { ToolAudition, ToolDraw, ToolContent, - ZoomIn, - ZoomOut, - ZoomFull, ZoomExpand, TimeAxisShrink, TimeAxisExpand, diff --git a/tools/icons/icon.cc b/tools/icons/icon.cc index 3b6338c748..98cb21363b 100644 --- a/tools/icons/icon.cc +++ b/tools/icons/icon.cc @@ -206,7 +206,6 @@ main (int argc, char** argv) draw_icon (cr, pos++, ArdourIcon::RecButton, Gtkmm2ext::Off); draw_icon (cr, pos++, ArdourIcon::RecButton, Gtkmm2ext::ImplicitActive); - draw_icon (cr, pos++, ArdourIcon::RecTapeMode, Gtkmm2ext::ImplicitActive); for (int i = 0; i < ArdourIcon::NoIcon; ++i) { draw_icon (cr, pos++, ArdourIcon::Icon (i), Gtkmm2ext::ExplicitActive);