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

Virtual-Keyboard: Fix use of scrollwheel on dropdowns

Browse source
This commit is contained in:
Robin Gareus 2019-10-20 21:22:38 +02:00
parent 88fc226107
commit 92173ca118
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/virtual_keyboard_window.cc
View file

@ -64,7 +64,7 @@ VirtualKeyboardWindow::VirtualKeyboardWindow ()
sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), 1))); sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), 1)));
_keyboard_layout.AddMenuElem (MenuElem ("AZERTY", _keyboard_layout.AddMenuElem (MenuElem ("AZERTY",
sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), 2))); sigc::bind (sigc::mem_fun (*this, &VirtualKeyboardWindow::select_keyboard_layout), 2)));
_keyboard_layout.set_text (_("QWERTY")); _keyboard_layout.set_active (_("QWERTY"));
_cfg_display.set_active (false); _cfg_display.set_active (false);
_pgm_display.set_active (false); _pgm_display.set_active (false);
@ -137,7 +137,7 @@ VirtualKeyboardWindow::VirtualKeyboardWindow ()
sprintf (key, "%d", c); sprintf (key, "%d", c);
_cc_key[i].append_text_item (key); _cc_key[i].append_text_item (key);
} }
_cc_key[i].set_text (default_cc[i]); _cc_key[i].set_active (default_cc[i]);
tbl->attach (*_cc_knob[i], i+3, i+4, 0, 1, SHRINK, SHRINK, 4, 2); tbl->attach (*_cc_knob[i], i+3, i+4, 0, 1, SHRINK, SHRINK, 4, 2);
tbl->attach (_cc_key[i] , i+3, i+4, 1, 2, SHRINK, SHRINK, 4, 2); tbl->attach (_cc_key[i] , i+3, i+4, 1, 2, SHRINK, SHRINK, 4, 2);
@ -243,7 +243,7 @@ VirtualKeyboardWindow::set_state (const XMLNode &root)
std::string layout; std::string layout;
if (node->get_property(X_("Layout"), layout)) { if (node->get_property(X_("Layout"), layout)) {
piano_keyboard_set_keyboard_layout (_piano, layout.c_str()); piano_keyboard_set_keyboard_layout (_piano, layout.c_str());
_keyboard_layout.set_text (layout); _keyboard_layout.set_active (layout);
} }
for (int i = 0; i < VKBD_NCTRLS; ++i) { for (int i = 0; i < VKBD_NCTRLS; ++i) {
@ -251,7 +251,7 @@ VirtualKeyboardWindow::set_state (const XMLNode &root)
sprintf (buf, "CC-%d", i); sprintf (buf, "CC-%d", i);
std::string cckey; std::string cckey;
if (node->get_property(buf, cckey)) { if (node->get_property(buf, cckey)) {
_cc_key[i].set_text (cckey); _cc_key[i].set_active (cckey);
} }
} }
@ -297,15 +297,12 @@ VirtualKeyboardWindow::select_keyboard_layout (int l)
default: default:
case 0: case 0:
piano_keyboard_set_keyboard_layout (_piano, "QWERTY"); piano_keyboard_set_keyboard_layout (_piano, "QWERTY");
_keyboard_layout.set_text (_("QWERTY"));
break; break;
case 1: case 1:
piano_keyboard_set_keyboard_layout (_piano, "QWERTZ"); piano_keyboard_set_keyboard_layout (_piano, "QWERTZ");
_keyboard_layout.set_text (_("QWERTZ"));
break; break;
case 2: case 2:
piano_keyboard_set_keyboard_layout (_piano, "AZERTY"); piano_keyboard_set_keyboard_layout (_piano, "AZERTY");
_keyboard_layout.set_text (_("AZERTY"));
break; break;
} }
} }