Merge branch 'master' of https://github.com/RaylockLLC/DearPyGui

tolidano · Aug 15, 2020 · 63490c6 · 63490c6
2 parents fd57fd7 + 4c78d68
commit 63490c6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/DearPyGui/include/mvMarvel.h b/DearPyGui/include/mvMarvel.h
@@ -1592,7 +1592,7 @@ namespace Marvel {
 		}, "Returns time since last frame.", "float") });
 
 		parsers->insert({ "get_main_window_size", mvPythonParser({
-		}, "Returns the size of the main window.", "[float, float]") });
+		}, "Returns the size of the main window.", "[int, int]") });
 
 		parsers->insert({ "get_thread_count", mvPythonParser({
 		}, "Returns the allowable thread count.", "int") });

diff --git a/DearPyGui/src/Core/mvMarvel.cpp b/DearPyGui/src/Core/mvMarvel.cpp
@@ -4332,7 +4332,7 @@ namespace Marvel {
 
 	PyObject* get_main_window_size(PyObject* self, PyObject* args, PyObject* kwargs)
 	{
-		return mvPythonTranslator::ToPyPair(mvApp::GetApp()->getActualWidth(), mvApp::GetApp()->getActualHeight());
+		return mvPythonTranslator::ToPyPairII(mvApp::GetApp()->getActualWidth(), mvApp::GetApp()->getActualHeight());
 	}
 
 	PyObject* get_theme(PyObject* self, PyObject* args, PyObject* kwargs)

diff --git a/DearPyGui/stubs/dearpygui.pyi b/DearPyGui/stubs/dearpygui.pyi
@@ -468,7 +468,7 @@ def get_log_level() -> int:
 	"""Returns the log level."""
 	...
 
-def get_main_window_size() -> [float, float]:
+def get_main_window_size() -> [int, int]:
 	"""Returns the size of the main window."""
 	...