Merge branch 'citra-emu:master' into vulkan-2

src/android/app/src/main/java/org/citra/citra_emu/ui/TwoPaneOnBackPressedCallback.java

@@ -1,6 +1,8 @@
 package org.citra.citra_emu.ui;
 
+import android.content.Context;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
@@ -32,6 +34,13 @@ public class TwoPaneOnBackPressedCallback extends OnBackPressedCallback
 
     @Override
     public void onPanelClosed(@NonNull View panel) {
+        closeKeyboard();
         setEnabled(false);
     }
+
+    private void closeKeyboard() {
+        InputMethodManager manager = (InputMethodManager) mSlidingPaneLayout.getContext()
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        manager.hideSoftInputFromWindow(mSlidingPaneLayout.getRootView().getWindowToken(), 0);
+    }
 }

src/citra_qt/main.ui

@@ -264,6 +264,9 @@
    <property name="text">
     <string>About Citra</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::AboutRole</enum>
+   </property>
   </action>
   <action name="action_Single_Window_Mode">
    <property name="checkable">
@@ -287,6 +290,9 @@
    <property name="text">
     <string>Configure...</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
+   </property>
   </action>
   <action name="action_Cheats">
    <property name="text">
@@ -549,6 +555,9 @@
    <property name="text">
     <string>Configure Current Game...</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
  </widget>
  <resources/>