Merge pull request #256 from LedgerHQ/y333/bagl_forward_button_event_to_os

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.22.2"
+version = "1.22.3"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true

ledger_device_sdk/Cargo.toml

@@ -538,33 +538,37 @@ impl<'a> MultiPageMenu<'a> {
 
         loop {
             match self.comm.next_event() {
-                io::Event::Button(button) => match button {
-                    BothButtonsRelease => return EventOrPageIndex::Index(index),
-                    b => {
-                        match b {
-                            LeftButtonRelease => {
-                                if index as i16 - 1 < 0 {
-                                    index = self.pages.len() - 1;
-                                } else {
-                                    index = index.saturating_sub(1);
-                                }
-                            }
-                            RightButtonRelease => {
-                                if index < self.pages.len() - 1 {
-                                    index += 1;
-                                } else {
-                                    index = 0;
+                io::Event::Button(button) => {
+                    if UxEvent::Event.request() == BOLOS_UX_OK {
+                        match button {
+                            BothButtonsRelease => return EventOrPageIndex::Index(index),
+                            b => {
+                                match b {
+                                    LeftButtonRelease => {
+                                        if index as i16 - 1 < 0 {
+                                            index = self.pages.len() - 1;
+                                        } else {
+                                            index = index.saturating_sub(1);
+                                        }
+                                    }
+                                    RightButtonRelease => {
+                                        if index < self.pages.len() - 1 {
+                                            index += 1;
+                                        } else {
+                                            index = 0;
+                                        }
+                                    }
+                                    _ => (),
                                 }
+                                clear_screen();
+                                self.pages[index].place();
+                                LEFT_ARROW.display();
+                                RIGHT_ARROW.display();
+                                crate::ui::screen_util::screen_update();
                             }
-                            _ => (),
                         }
-                        clear_screen();
-                        self.pages[index].place();
-                        LEFT_ARROW.display();
-                        RIGHT_ARROW.display();
-                        crate::ui::screen_util::screen_update();
                     }
-                },
+                }
                 io::Event::Command(ins) => return EventOrPageIndex::Event(io::Event::Command(ins)),
                 io::Event::Ticker => {
                     if UxEvent::Event.request() != BOLOS_UX_OK {