Browse Source

Merge branch 'v2' of github.com:VCVRack/Rack-private into v2

tags/v2.0.0
Andrew Belt 3 years ago
parent
commit
61a73b786e
2 changed files with 1 additions and 6 deletions
  1. +1
    -1
      src/app/Browser.cpp
  2. +0
    -5
      src/ui/TextField.cpp

+ 1
- 1
src/app/Browser.cpp View File

@@ -445,7 +445,7 @@ struct ZoomButton : ui::ChoiceButton {
menu->box.pos = getAbsoluteOffset(math::Vec(0, box.size.y));
menu->box.size.x = box.size.x;

for (float zoom = 0.f; zoom >= -2.f; zoom -= 0.5f) {
for (float zoom = 1.f; zoom >= -2.f; zoom -= 0.5f) {
ZoomItem* sortItem = new ZoomItem;
sortItem->text = string::f("%.0f%%", std::pow(2.f, zoom) * 100.f);
sortItem->zoom = zoom;


+ 0
- 5
src/ui/TextField.cpp View File

@@ -228,11 +228,6 @@ void TextField::onSelectKey(const SelectKeyEvent& e) {
}
e.consume(this);
}
// Escape
if (e.key == GLFW_KEY_ESCAPE && (e.mods & RACK_MOD_MASK) == 0) {
APP->event->setSelectedWidget(NULL);
e.consume(this);
}
// Tab
if (e.key == GLFW_KEY_TAB && (e.mods & RACK_MOD_MASK) == 0) {
if (nextField)


Loading…
Cancel
Save