roku_family_photos.git

@@ -43,6 +43,7 @@ sub main()

             else if (button = 10)  ' Info button

                 display_dialog()

                 ' TODO: Fix a bug where the dialog doesn't go away

+                m.screen.DrawScaledObject(0, 0, m.scaleX, m.scaleY, m.currentBitmap)

             end if

         end if

@@ -55,12 +56,13 @@ function display_dialog()

     ' First, create an roImageCanvas to live behind the dialog

     canvas = CreateObject("roImageCanvas")

-    canvas.SetMessagePort(CreateObject("roMessagePort"))

+    message_port = CreateObject("roMessagePort")

+    canvas.SetMessagePort(message_port)

     canvas.SetLayer(0, {Color:"#00000000", CompositionMode:"Source_Over"})  ' Transparent

     canvas.Show()

     dialog = CreateObject("roPinEntryDialog")

-    dialog.SetMessagePort(CreateObject("roMessagePort"))

+    dialog.SetMessagePort(message_port)

     dialog.EnableOverlay(true)

     dialog.EnableBackButton(true)

     dialog.SetNumPinEntryFields(4)

@@ -70,24 +72,25 @@ function display_dialog()

     dialog.Show()

     while True

         msg = wait(0, dialog.GetMessagePort())

-        if msg <> invalid

+        if msg <> invalid and type(msg) = "roPinEntryDialogEvent"

             print "msg is "; msg

             if msg.isScreenClosed()

-                print "msg is isScreenClosed"; msg

+                print "msg is isScreenClosed"; msg; type(msg)

                 exit while

             else if msg.isButtonPressed()

                 print "the index of the button pressed is"; msg.GetIndex()

                 if msg.GetIndex() = 1

-                    print "The user entereded PIN "; dialog.Pin()

+                    print "The user entered PIN "; dialog.Pin()

+                    dialog.Close()

                 else if msg.GetIndex() = 99

                     print "The user cancelled."

+                    dialog.Close()

                 endif

-                exit while

             end if

         end if

     end while

-    dialog.Close()

     canvas.Close()

+    print "After closing the dialog and canvas."

 end function