summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_strip.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-11-28 18:45:28 +0000
committerCarl Hetherington <carl@carlh.net>2011-11-28 18:45:28 +0000
commit542b1d96534e4da5baab5f06292fe7b50c471692 (patch)
tree0df0dee0363d011c3de63165a8bc382a55f2f5cb /gtk2_ardour/mixer_strip.cc
parenta296820cafc1745542bb5371f2613b283efa8a73 (diff)
Control-shift-click rather than just Shift-click to
toggle mixer strip width. git-svn-id: svn://localhost/ardour2/branches/3.0@10831 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
-rw-r--r--gtk2_ardour/mixer_strip.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 3e829074c8..0d40d6fadd 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -147,7 +147,7 @@ MixerStrip::init ()
string t = _("Click to toggle the width of this mixer strip.");
if (_mixer_owned) {
- t += string_compose (_("\n%1-click to toggle the width of all strips."), Keyboard::tertiary_modifier_name ());
+ t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ());
}
width_button.set_image (::get_icon("strip_width"));
@@ -1517,7 +1517,7 @@ MixerStrip::width_button_pressed (GdkEventButton* ev)
return false;
}
- if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::TertiaryModifier)) && _mixer_owned) {
+ if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) {
switch (_width) {
case Wide:
_mixer.set_strip_width (Narrow);