Просмотр исходного кода

applets: Correct event ResetTypes from OneShot to Sticky
Fixes bugs relating to signalling in software keyboard.

Zach Hilman 7 лет назад
Родитель
Сommit
e11e65b3d6

+ 3 - 3
src/core/hle/service/am/applets/applets.cpp

@@ -16,11 +16,11 @@ namespace Service::AM::Applets {
 AppletDataBroker::AppletDataBroker() {
     auto& kernel = Core::System::GetInstance().Kernel();
     state_changed_event = Kernel::WritableEvent::CreateEventPair(
-        kernel, Kernel::ResetType::OneShot, "ILibraryAppletAccessor:StateChangedEvent");
+        kernel, Kernel::ResetType::Sticky, "ILibraryAppletAccessor:StateChangedEvent");
     pop_out_data_event = Kernel::WritableEvent::CreateEventPair(
-        kernel, Kernel::ResetType::OneShot, "ILibraryAppletAccessor:PopDataOutEvent");
+        kernel, Kernel::ResetType::Sticky, "ILibraryAppletAccessor:PopDataOutEvent");
     pop_interactive_out_data_event = Kernel::WritableEvent::CreateEventPair(
-        kernel, Kernel::ResetType::OneShot, "ILibraryAppletAccessor:PopInteractiveDataOutEvent");
+        kernel, Kernel::ResetType::Sticky, "ILibraryAppletAccessor:PopInteractiveDataOutEvent");
 }
 
 AppletDataBroker::~AppletDataBroker() = default;

+ 1 - 0
src/core/hle/service/am/applets/profile_select.cpp

@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <cstring>
+
 #include "common/assert.h"
 #include "common/string_util.h"
 #include "core/core.h"

+ 0 - 4
src/core/hle/service/am/applets/profile_select.h

@@ -4,14 +4,10 @@
 
 #pragma once
 
-#include <array>
-#include <string>
 #include <vector>
 
 #include "common/common_funcs.h"
-#include "common/swap.h"
 #include "core/hle/service/acc/profile_manager.h"
-#include "core/hle/service/am/am.h"
 #include "core/hle/service/am/applets/applets.h"
 
 namespace Service::AM::Applets {

+ 1 - 6
src/core/hle/service/am/applets/software_keyboard.cpp

@@ -38,12 +38,7 @@ static Core::Frontend::SoftwareKeyboardParameters ConvertToFrontendParameters(
     return params;
 }
 
-SoftwareKeyboard::SoftwareKeyboard() {
-    // Some applets require this to be signalled on applet creation, some do not. Internally, this
-    // is done by a flag in the applet module, but for simplicity SoftwareKeyboard is one of the
-    // applets with this flag.
-    broker.SignalStateChanged();
-}
+SoftwareKeyboard::SoftwareKeyboard() = default;
 
 SoftwareKeyboard::~SoftwareKeyboard() = default;
 

+ 1 - 1
src/yuzu/applets/profile_select.h

@@ -23,7 +23,7 @@ class QtProfileSelectionDialog final : public QDialog {
     Q_OBJECT
 
 public:
-    QtProfileSelectionDialog(QWidget* parent);
+    explicit QtProfileSelectionDialog(QWidget* parent);
     ~QtProfileSelectionDialog() override;
 
     void accept() override;