Merge branch 'master' into feature/scroll-handler

Author: v-ein

dearpygui/_dearpygui.pyi

@@ -78,6 +78,10 @@ GetModuleConstants()
 		ModuleConstants.push_back({"mvScrollDirection_YAxis", mvScrollDirection_YAxis });
 		ModuleConstants.push_back({"mvScrollDirection_Horizontal", mvScrollDirection_Horizontal });
 		ModuleConstants.push_back({"mvScrollDirection_Vertical", mvScrollDirection_Vertical });
+		ModuleConstants.push_back({"mvEventType_Off",	mvEventType_Off });
+		ModuleConstants.push_back({"mvEventType_Enter", mvEventType_Enter });
+		ModuleConstants.push_back({"mvEventType_On", 	mvEventType_On });
+		ModuleConstants.push_back({"mvEventType_Leave", mvEventType_Leave });
 
 		ModuleConstants.push_back({"mvPlatform_Windows", 0L });
 		ModuleConstants.push_back({"mvPlatform_Apple", 1L });

dearpygui/_dearpygui_RTD.py

@@ -2183,19 +2183,26 @@ save_init_file(PyObject* self, PyObject* args, PyObject* kwargs)
 static PyObject*
 split_frame(PyObject* self, PyObject* args, PyObject* kwargs)
 {
-	i32 delay = 32;
-
-	if (!Parse((GetParsers())["split_frame"], args, kwargs, __FUNCTION__,
-		&delay))
+	if (!Parse((GetParsers())["split_frame"], args, kwargs, __FUNCTION__))
 		return GetPyNone();
 
-	// std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
+	if (GContext->running)
+	{
+		Py_BEGIN_ALLOW_THREADS;
+		std::unique_lock lk(GContext->frameEndedMutex);
+		GContext->frameEnded = false;
+		GContext->frameEndedEvent.wait(lk, []{return GContext->frameEnded;});
+		lk.unlock();
 
-	Py_BEGIN_ALLOW_THREADS;
-	GContext->waitOneFrame = true;
-	while (GContext->waitOneFrame)
-		std::this_thread::sleep_for(std::chrono::milliseconds(delay));
-	Py_END_ALLOW_THREADS;
+		Py_END_ALLOW_THREADS;
+	}
+
+	// Now let's see if it was successful (there's a chance that DPG got stopped while we were waiting)
+	if (!GContext->running)
+	{
+		mvThrowPythonError(mvErrorCode::mvNone, "split_frame is exiting: there is no active rendering loop.");
+		return nullptr;
+	}
 
 	return GetPyNone();
 }
@@ -2566,7 +2573,7 @@ destroy_context(PyObject* self, PyObject* args, PyObject* kwargs)
 	else
 	{
 		// Make sure everyone knows we're shutting down, even if stop_dearpygui
-		// was not called.
+		// was not called.  This also releases any waiting split_frame calls.
 		StopRendering();
 
 		Py_BEGIN_ALLOW_THREADS;

dearpygui/dearpygui.py

@@ -564,7 +564,7 @@ InsertParser_Block1(std::map<std::string, mvPythonParser>& parsers)
 
 	{
 		std::vector<mvPythonDataElement> args;
-		args.push_back({ mvPyDataType::Integer, "delay", mvArgType::KEYWORD_ARG, "32", "Minimal delay in in milliseconds" });
+		args.push_back({ mvPyDataType::Integer, "delay", mvArgType::DEPRECATED_REMOVE_KEYWORD_ARG, "32", "Do not use it anymore, it has no effect." });
 
 		mvPythonParserSetup setup;
 		setup.about = "Waits one frame.";

src/dearpygui.cpp

@@ -4903,6 +4903,8 @@ DearPyGui::GetEntityParser(mvAppItemType type)
             MV_PARSER_ARG_CALLBACK)
         );
 
+        args.push_back({ mvPyDataType::Integer, "event_type", mvArgType::KEYWORD_ARG, "None", "What kind of events to track: mouse-in (mvEventType_Enter), mouse-over (mvEventType_On), mouse-out (mvEventType_Leave). Can be a combination of these flags. Defaults to mouse-over." });
+
         setup.about = "Adds a hover handler.";
         setup.category = { "Widgets", "Events" };
         break;
@@ -4929,6 +4931,8 @@ DearPyGui::GetEntityParser(mvAppItemType type)
             MV_PARSER_ARG_CALLBACK)
         );
 
+        args.push_back({ mvPyDataType::Integer, "event_type", mvArgType::KEYWORD_ARG, "None", "What kind of events to track: just got focus (mvEventType_Enter), currently having focus (mvEventType_On), lost focus (mvEventType_Leave). Can be a combination of these flags. Defaults to mvEventType_On." });
+
         setup.about = "Adds a focus handler.";
         setup.category = { "Widgets", "Events" };
         break;

src/dearpygui_commands.h

@@ -8,8 +8,10 @@ void
 ResetAppItemState(mvAppItemState& state)
 {
     state.hovered = false;
+    state.prevHovered = false;
     state.active = false;
     state.focused = false;
+    state.prevFocused = false;
     state.leftclicked = false;
     state.rightclicked = false;
     state.middleclicked = false;
@@ -29,8 +31,10 @@ void
 UpdateAppItemState(mvAppItemState& state)
 {
     state.lastFrameUpdate = GContext->frame;
+    state.prevHovered = state.hovered;
     state.hovered = ImGui::IsItemHovered();
     state.active = ImGui::IsItemActive();
+    state.prevFocused = state.focused;
     state.focused = ImGui::IsItemFocused();
     if (state.focused)
     {

src/dearpygui_parsers.h

@@ -71,8 +71,10 @@ inline b8 IsItemDoubleClicked(ImGuiMouseButton mouse_button)
 struct mvAppItemState
 {
     b8         hovered              = false;
+    b8         prevHovered          = false;
     b8         active               = false;
     b8         focused              = false;
+    b8         prevFocused          = false;
     b8         leftclicked          = false;
     b8         rightclicked         = false;
     b8         middleclicked        = false;

src/mvAppItem.cpp

@@ -2642,6 +2642,7 @@ DearPyGui::draw_simple_plot(ImDrawList* drawlist, mvAppItem& item, const mvSimpl
 	//   * only update if applicable
 	//-----------------------------------------------------------------------------
 	item.state.lastFrameUpdate = GContext->frame;
+    item.state.prevHovered = item.state.hovered;
 	item.state.hovered = ImGui::IsItemHovered();
 	item.state.leftclicked = ImGui::IsItemClicked();
 	item.state.rightclicked = ImGui::IsItemClicked(1);
@@ -4388,26 +4389,7 @@ DearPyGui::draw_radio_button(ImDrawList* drawlist, mvAppItem& item, mvRadioButto
 	//-----------------------------------------------------------------------------
 	// update state
 	//-----------------------------------------------------------------------------
-	item.state.lastFrameUpdate = GContext->frame;
-	item.state.hovered = ImGui::IsItemHovered();
-	item.state.active = ImGui::IsItemActive();
-	item.state.focused = ImGui::IsItemFocused();
-	item.state.leftclicked = ImGui::IsItemClicked();
-	item.state.rightclicked = ImGui::IsItemClicked(1);
-	item.state.middleclicked = ImGui::IsItemClicked(2);
-    for (int i = 0; i < item.state.doubleclicked.size(); i++)
-    {
-        item.state.doubleclicked[i] = IsItemDoubleClicked(i);
-    }
-	item.state.visible = ImGui::IsItemVisible();
-	item.state.activated = ImGui::IsItemActivated();
-	item.state.deactivated = ImGui::IsItemDeactivated();
-	item.state.deactivatedAfterEdit = ImGui::IsItemDeactivatedAfterEdit();
-	item.state.toggledOpen = ImGui::IsItemToggledOpen();
-	item.state.rectMin = { ImGui::GetItemRectMin().x, ImGui::GetItemRectMin().y };
-	item.state.rectMax = { ImGui::GetItemRectMax().x, ImGui::GetItemRectMax().y };
-	item.state.rectSize = { ImGui::GetItemRectSize().x, ImGui::GetItemRectSize().y };
-	item.state.contextRegionAvail = { ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y };
+	UpdateAppItemState(item.state);
 
 	//-----------------------------------------------------------------------------
 	// post draw