Window closing works. Frame Runner works

plyhun · Mar 19, 2020 · 90ecc5f · 90ecc5f
1 parent 7ab7a89
commit 90ecc5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,10 +10,10 @@ path = "src/lib.rs"
 
 [dependencies]
 plygui-api = {version = "0.0.1", path = "../plygui/api"}
-qt_core = {version = "~0.4"}
-qt_gui = {version = "~0.4"}
-qt_widgets = {version = "~0.4"}
-qt_core_custom_events = {version = "~0.1"}
+qt_core = {version = "0.5.0-alpha.2"}
+qt_gui = {version = "0.5.0-alpha.2"}
+qt_widgets = {version = "0.5.0-alpha.2"}
+qt_core_custom_events = {version = "~0.2"}
 lazy_static = {version = "~1.4"}
 libc = {version = "~0.2"}
 

diff --git a/src/application.rs b/src/application.rs
@@ -3,6 +3,7 @@ use crate::common::{self, *};
 use qt_core::{QCoreApplication, QCoreApplicationArgs};
 use qt_core::QTimer;
 use qt_core::QString;
+use qt_core::ConnectionType;
 use qt_gui::QGuiApplication;
 use qt_widgets::QApplication;
 
@@ -74,7 +75,7 @@ impl<O: controls::Application> NewApplicationInner<O> for QtApplication {
             }
         };
         a.queue = unsafe { SlotNoArgs::new(NullPtr, handler) };
-        unsafe { a.timer.timeout().connect(&a.queue) };
+        unsafe { a.timer.timeout().connect_with_type(ConnectionType::QueuedConnection, &a.queue) };
         a
     }
 }
@@ -89,7 +90,9 @@ impl ApplicationInner for QtApplication {
 	        b.as_mut_ptr().write(ab);
 	        b.assume_init()
         };
-        a.inner_mut().timer.slot_start();
+        unsafe {
+        	a.inner_mut().timer.start_0a();
+        }
         a
     }
 	fn frame_sleep(&self) -> u32 {