From b61b1cd7aa13692c4ed06638de3cf2dc2cd2d1f1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 31 Jul 2018 15:43:21 +0200 Subject: [PATCH] Tweak FP2/2018 Ctrl-Surface UI --- gtk2_ardour/icons/faderport2018-small.png | Bin 0 -> 12629 bytes libs/surfaces/faderport8/gui.cc | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 gtk2_ardour/icons/faderport2018-small.png diff --git a/gtk2_ardour/icons/faderport2018-small.png b/gtk2_ardour/icons/faderport2018-small.png new file mode 100644 index 0000000000000000000000000000000000000000..c2a668ef2b36c8e5e09a0e9e3d1da8458ff02474 GIT binary patch literal 12629 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 Dl{?nV literal 0 HcmV?d00001 diff --git a/libs/surfaces/faderport8/gui.cc b/libs/surfaces/faderport8/gui.cc index fb12c00eb6..3a537de028 100644 --- a/libs/surfaces/faderport8/gui.cc +++ b/libs/surfaces/faderport8/gui.cc @@ -96,7 +96,7 @@ FP8GUI::FP8GUI (FaderPort8& p) #ifdef FADERPORT16 string name = "faderport16-small.png"; #elif defined FADERPORT2 - string name = ""; // TODO + string name = "faderport2018-small.png"; #else string name = "faderport8-small.png"; #endif @@ -166,7 +166,12 @@ FP8GUI::FP8GUI (FaderPort8& p) align->add (*user_combo); table.attach (*align, 3 * action_col + 1, 3 * action_col + 2, row + action_row, row + action_row + 1, AttachOptions(FILL|EXPAND), AttachOptions (0)); - if (++action_row == 4) { +#ifdef FADERPORT2 + if (++action_row == 2) +#else + if (++action_row == 4) +#endif + { action_row = 0; ++action_col; }