Release Nageru 1.7.2.

[nageru] / midi_mapping_dialog.cpp

diff --git a/midi_mapping_dialog.cpp b/midi_mapping_dialog.cpp
index 02ce308daed8cb814f481a2389485f4fa5a041cd..89656039698b3fe47d36a4e26f7a73767f876d09 100644 (file)
--- a/midi_mapping_dialog.cpp
+++ b/midi_mapping_dialog.cpp
@@ -20,6 +20,7 @@
 
 #include "midi_mapper.h"
 #include "midi_mapping.pb.h"
+#include "post_to_main_thread.h"
 #include "ui_midi_mapping.h"
 
 class QObject;
@@ -279,9 +280,15 @@ void MIDIMappingDialog::cancel_clicked()
 
 void MIDIMappingDialog::save_clicked()
 {
+#if HAVE_CEF
+       // The native file dialog uses GTK+, which interferes with CEF's use of the GLib main loop.
+       QFileDialog::Option options(QFileDialog::DontUseNativeDialog);
+#else
+       QFileDialog::Option options;
+#endif
        unique_ptr<MIDIMappingProto> new_mapping = construct_mapping_proto_from_ui();
        QString filename = QFileDialog::getSaveFileName(this,
-               "Save MIDI mapping", QString(), tr("Mapping files (*.midimapping)"));
+               "Save MIDI mapping", QString(), tr("Mapping files (*.midimapping)"), /*selectedFilter=*/nullptr, options);
        if (!filename.endsWith(".midimapping")) {
                filename += ".midimapping";
        }
@@ -294,8 +301,14 @@ void MIDIMappingDialog::save_clicked()
 
 void MIDIMappingDialog::load_clicked()
 {
+#if HAVE_CEF
+       // The native file dialog uses GTK+, which interferes with CEF's use of the GLib main loop.
+       QFileDialog::Option options(QFileDialog::DontUseNativeDialog);
+#else
+       QFileDialog::Option options;
+#endif
        QString filename = QFileDialog::getOpenFileName(this,
-               "Load MIDI mapping", QString(), tr("Mapping files (*.midimapping)"));
+               "Load MIDI mapping", QString(), tr("Mapping files (*.midimapping)"), /*selectedFilter=*/nullptr, options);
        MIDIMappingProto new_mapping;
        if (!load_midi_mapping_from_file(filename.toStdString(), &new_mapping)) {
                QMessageBox box;
@@ -445,28 +458,32 @@ void MIDIMappingDialog::fill_controls_from_mapping(const MIDIMappingProto &mappi
 
 void MIDIMappingDialog::controller_changed(unsigned controller)
 {
-       for (const InstantiatedSpinner &is : controller_spinners) {
-               if (is.spinner->hasFocus()) {
-                       is.spinner->setValue(controller);
-                       is.spinner->selectAll();
+       post_to_main_thread([=]{
+               for (const InstantiatedSpinner &is : controller_spinners) {
+                       if (is.spinner->hasFocus()) {
+                               is.spinner->setValue(controller);
+                               is.spinner->selectAll();
+                       }
                }
-       }
+       });
 }
 
 void MIDIMappingDialog::note_on(unsigned note)
 {
-       for (const InstantiatedSpinner &is : button_spinners) {
-               if (is.spinner->hasFocus()) {
-                       is.spinner->setValue(note);
-                       is.spinner->selectAll();
+       post_to_main_thread([=]{
+               for (const InstantiatedSpinner &is : button_spinners) {
+                       if (is.spinner->hasFocus()) {
+                               is.spinner->setValue(note);
+                               is.spinner->selectAll();
+                       }
                }
-       }
-       for (const InstantiatedSpinner &is : light_spinners) {
-               if (is.spinner->hasFocus()) {
-                       is.spinner->setValue(note);
-                       is.spinner->selectAll();
+               for (const InstantiatedSpinner &is : light_spinners) {
+                       if (is.spinner->hasFocus()) {
+                               is.spinner->setValue(note);
+                               is.spinner->selectAll();
+                       }
                }
-       }
+       });
 }
 
 pair<int, int> MIDIMappingDialog::guess_offset(unsigned bus_idx, MIDIMappingDialog::SpinnerGroup spinner_group)