Use UI.uninit instead of calling UI.quit twice

Related to #45 Reported by @rubyFeedback and @AndyObtiva Thanks!!!
kojix2 · Jun 25, 2023 · 042eb04 · 042eb04
1 parent 601e981
commit 042eb04
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 74 deletions.
diff --git a/examples/basic_area.rb b/examples/basic_area.rb
@@ -42,11 +42,10 @@
 UI.window_set_child(main_window, box)
 
 UI.window_on_closing(main_window) do
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 UI.control_show(main_window)
 
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/basic_button.rb b/examples/basic_button.rb
@@ -14,13 +14,12 @@
 
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 
 UI.window_set_child(main_window, button)
 UI.control_show(main_window)
 
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/basic_draw_text.rb b/examples/basic_draw_text.rb
@@ -108,11 +108,10 @@ def attr_str.append(what, color)
 UI.window_set_child(main_window, box)
 
 UI.window_on_closing(main_window) do
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 UI.control_show(main_window)
 
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/basic_entry.rb b/examples/basic_entry.rb
@@ -7,9 +7,8 @@
 main_window = UI.new_window('Basic Entry', 300, 50, 1)
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 
 hbox = UI.new_horizontal_box
@@ -33,4 +32,4 @@
 
 UI.control_show(main_window)
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/basic_table.rb b/examples/basic_table.rb
@@ -52,11 +52,10 @@ def rbcallback(*args, &block)
 
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
-  UI.free_table_model(model)
   UI.quit
-  0
+  1
 end
 
 UI.main
-UI.quit
+UI.free_table_model(model)
+UI.uninit
diff --git a/examples/basic_table_image.rb b/examples/basic_table_image.rb
@@ -65,12 +65,11 @@ def rbcallback(*args, &block)
 
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
-  UI.free_table_model(model)
-  IMAGES.each { |i| UI.free_image(i) }
   UI.quit
-  0
+  1
 end
 
 UI.main
-UI.quit
+UI.free_table_model(model)
+IMAGES.each { |i| UI.free_image(i) }
+UI.uninit
diff --git a/examples/basic_window.rb b/examples/basic_window.rb
@@ -10,10 +10,9 @@
 
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/control_gallery.rb b/examples/control_gallery.rb
@@ -3,13 +3,6 @@
 
 UI.init
 
-should_quit = proc do
-  puts 'Bye Bye'
-  UI.control_destroy(MAIN_WINDOW)
-  UI.quit
-  0
-end
-
 # File menu
 menu = UI.new_menu('File')
 open_menu_item = UI.menu_append_item(menu, 'Open')
@@ -22,9 +15,21 @@
   pt = UI.save_file(MAIN_WINDOW)
   puts pt unless pt.null?
 end
-
+UI.menu_append_separator(menu)
+should_quit_item = UI.menu_append_check_item(menu, 'Should Quit_')
+UI.menu_item_set_checked(should_quit_item, 1)
 UI.menu_append_quit_item(menu)
-UI.on_should_quit(should_quit)
+# onShouldQuit callback is called when the user presses the quit menu item.
+UI.on_should_quit do
+  if UI.menu_item_checked(should_quit_item) == 1
+    puts 'Bye Bye (on_should_quit)'
+    UI.control_destroy(MAIN_WINDOW) # You have to destroy the window manually.
+    1 # UI.quit is automatically called in the C function onQuitClicked().
+  else
+    UI.msg_box(MAIN_WINDOW, 'Warning', 'Please check "Should Quit"')
+    0 # Don't quit
+  end
+end
 
 # Edit menu
 edit_menu = UI.new_menu('Edit')
@@ -43,7 +48,13 @@
 # Main Window
 MAIN_WINDOW = UI.new_window('Control Gallery', 600, 500, 1)
 UI.window_set_margined(MAIN_WINDOW, 1)
-UI.window_on_closing(MAIN_WINDOW, should_quit)
+UI.window_on_closing(MAIN_WINDOW) do
+  puts 'Bye Bye'
+  UI.quit
+  # return 1 to destroys the window automatically.
+  # return 0 to keep the window. (You can destroy it manually.)
+  1
+end
 
 vbox = UI.new_vertical_box
 UI.window_set_child(MAIN_WINDOW, vbox)
@@ -187,4 +198,4 @@
 UI.control_show(MAIN_WINDOW)
 
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/date_time_picker.rb b/examples/date_time_picker.rb
@@ -28,12 +28,11 @@
 main_window = UI.new_window('Date Time Pickers', 300, 200, 1)
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 UI.window_set_child(main_window, vbox)
 UI.control_show(main_window)
 
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/draw_text.rb b/examples/draw_text.rb
@@ -124,18 +124,13 @@ def draw_event(adp, attr_str, font_button, alignment)
 handler.DragBroken   = do_nothing
 handler.KeyEvent     = key_event
 
-UI.on_should_quit do
-  UI.control_destroy(main_window)
-end
-
 @attr_str = make_attribute_string
 
 main_window = UI.new_window('Text-Drawing Example', 640, 480, 1)
 UI.window_set_margined(main_window, 1)
 UI.window_on_closing(main_window) do
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 
 hbox = UI.new_horizontal_box

diff --git a/examples/font_button.rb b/examples/font_button.rb
@@ -20,13 +20,12 @@
 
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 
 UI.window_set_child(main_window, font_button)
 UI.control_show(main_window)
 
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/gpt2_notepad.rb b/examples/gpt2_notepad.rb
@@ -63,9 +63,8 @@ def predict_text(s, max = 30)
 main_window = UI.new_window('GPT-2 Notepad', 500, 300, 1)
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 
 hbox = UI.new_vertical_box
@@ -98,4 +97,4 @@ def predict_text(s, max = 30)
 
 UI.control_show(main_window)
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/histogram.rb b/examples/histogram.rb
@@ -180,15 +180,13 @@ def set_solid_brush(brush, color, alpha)
 UI.window_set_margined(MAIN_WINDOW, 1)
 UI.window_set_child(MAIN_WINDOW, hbox)
 
-should_quit = proc do |_ptr|
-  UI.control_destroy(MAIN_WINDOW)
+UI.window_on_closing(MAIN_WINDOW) do
+  puts 'Bye Bye'
   UI.quit
-  0
+  1
 end
 
-UI.window_on_closing(MAIN_WINDOW, should_quit)
-UI.on_should_quit(should_quit)
 UI.control_show(MAIN_WINDOW)
 
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/midi_player.rb b/examples/midi_player.rb
@@ -66,9 +66,8 @@ def create_gui
       UI.menu_item_on_clicked(version_item) { show_version(main_window) }
 
       UI.window_on_closing(main_window) do
-        UI.control_destroy(main_window)
         UI.quit
-        0
+        1
       end
 
       UI.new_horizontal_box.tap do |hbox|
@@ -101,7 +100,7 @@ def create_gui
       UI.control_show(main_window)
     end
     UI.main
-    UI.quit
+    UI.uninit
   end
 end
 

diff --git a/examples/simple_notepad.rb b/examples/simple_notepad.rb
@@ -9,9 +9,8 @@
 main_window = UI.new_window('Notepad', 500, 300, 1)
 UI.window_on_closing(main_window) do
   puts 'Bye Bye'
-  UI.control_destroy(main_window)
   UI.quit
-  0
+  1
 end
 
 vbox = UI.new_vertical_box
@@ -22,4 +21,4 @@
 
 UI.control_show(main_window)
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/spectrum.rb b/examples/spectrum.rb
@@ -92,11 +92,10 @@ def spec
 UI.window_set_child(main_window, box)
 
 UI.window_on_closing(main_window) do
-  UI.control_destroy(main_window)
   UI.quit
   stream.close
   ::FFI::PortAudio::API.Pa_Terminate
-  0
+  1
 end
 UI.control_show(main_window)
 
@@ -107,4 +106,4 @@ def spec
   end
 end
 UI.main
-UI.quit
+UI.uninit
diff --git a/examples/turing_pattern.rb b/examples/turing_pattern.rb
@@ -321,16 +321,12 @@ def uint8_zeros_256(ch, ar)
 
 # menu File Quit
 
-quit_proc = proc do
-  @running = false
+menu_file_quit = UI.menu_append_quit_item(menu_file)
+UI.on_should_quit do
   UI.control_destroy(@main_window)
-  UI.quit
-  0
+  1
 end
 
-menu_file_quit = UI.menu_append_item(menu_file, 'Quit')
-UI.menu_item_on_clicked(menu_file_quit, quit_proc)
-
 # menu Help
 
 menu_help = UI.new_menu('Help')
@@ -594,7 +590,10 @@ def uint8_zeros_256(ch, ar)
 UI.window_set_margined(@main_window, 1)
 UI.window_set_child(@main_window, vbox)
 
-UI.window_on_closing(@main_window, quit_proc)
+UI.window_on_closing(@main_window) do
+  UI.quit
+  1
+end
 UI.control_show(@main_window)
 
 # queue
@@ -612,4 +611,4 @@ def uint8_zeros_256(ch, ar)
 end
 
 UI.main
-UI.quit
+UI.uninit