Updating backend ImGui/ImPlot/ImNodes to latest versions

.gitignore

@@ -1,5 +1,6 @@
 .idea/
 .vs/
+.vscode/
 out/
 cmake-build-debug/
 cmake-build-release/
@@ -11,4 +12,10 @@ __pycache__/
 lib_location.txt
 version_number.txt
 dearpygui.egg-info/
-build/
+build/
+# Ignore only subdirectories
+sandbox/*/
+src/CMakeFiles/
+thirdparty/CMakeFiles/
+thirdparty/Makefile
+thirdparty/cmake_install.cmake

.gitmodules

@@ -1,6 +1,10 @@
 [submodule "thirdparty/imgui"]
 	path = thirdparty/imgui
 	url = https://github.com/ocornut/imgui
+	branch = docking
+[submodule "thirdparty/implot"]
+	path = thirdparty/implot
+	url = https://github.com/epezent/implot
 	branch = master
 [submodule "thirdparty/cpython"]
 	path = thirdparty/cpython
@@ -13,6 +17,3 @@
 [submodule "thirdparty/freetype"]
 	path = thirdparty/freetype
 	url = https://gitlab.freedesktop.org/freetype/freetype
-[submodule "thirdparty/DearPyGui_Ext"]
-	path = thirdparty/DearPyGui_Ext
-	url = https://github.com/hoffstadt/DearPyGui_Ext

dearpygui/_deprecated.py

@@ -1,4 +1,7 @@
 
+from typing import Union
+
+
 def deprecated(reason):
 
 	string_types = (type(b''), type(u''))
@@ -42,11 +45,6 @@ def new_func2(*args, **kwargs):
 
 		return new_func2
 
-@deprecated("Use 'configure_app(docking=True, docking_space=dock_space)'.")
-def enable_docking(dock_space=False):
-    """ deprecated function """
-    internal_dpg.configure_app(docking=True, docking_space=dock_space)
-
 @deprecated("Use 'configure_app(init_file=file)'.")
 def set_init_file(file="dpg.ini"):
     """ deprecated function """
@@ -258,6 +256,76 @@ def add_same_line(**kwargs):
     internal_dpg.capture_next_item(lambda s: internal_dpg.move_item(s, parent=group))
     return group
 
+@deprecated("Use: `get_plot_query_rects()`")
+def is_plot_queried(plot: Union[int, str], **kwargs):
+	"""	(deprecated function) Returns true if the plot is currently being queried. 
+
+	Args:
+		plot (Union[int, str]): 
+	Returns:
+		bool
+	"""
+
+	return len(internal_dpg.get_plot_query_rects(plot, **kwargs)) > 0
+
+@deprecated("Use: `get_plot_query_rects()`")
+def get_plot_query_area(plot: Union[int, str], **kwargs):
+	"""	(deprecated function) Returns the last/current query area of the plot. If no area is available [0, 0, 0, 0] will be returned.
+
+	Args:
+		plot (Union[int, str]): 
+	Returns:
+		Union[List[float], Tuple[float, ...]]
+	"""
+
+	if rects := internal_dpg.get_plot_query_rects(plot, **kwargs):
+		return rects[0]
+	else:
+		return [0, 0, 0, 0]
+
+@deprecated("Use: `add_inf_line_series(horizontal=True)`")
+def add_hline_series(x, **kwargs):
+	"""	(deprecated function) Adds an infinite horizontal line series to a plot.
+
+	Args:
+		x (Any): 
+		label (str, optional): Overrides 'name' as label.
+		user_data (Any, optional): User data for callbacks
+		use_internal_label (bool, optional): Use generated internal label instead of user specified (appends ### uuid).
+		tag (Union[int, str], optional): Unique id used to programmatically refer to the item.If label is unused this will be the label.
+		parent (Union[int, str], optional): Parent to add this item to. (runtime adding)
+		before (Union[int, str], optional): This item will be displayed before the specified item in the parent.
+		source (Union[int, str], optional): Overrides 'id' as value storage key.
+		show (bool, optional): Attempt to render widget.
+		id (Union[int, str], optional): (deprecated)
+	Returns:
+		Union[int, str]
+	"""
+
+	return internal_dpg.add_inf_line_series(x, **kwargs, horizontal=True)
+
+
+@deprecated("Use: `add_inf_line_series()`")
+def add_vline_series(x, **kwargs):
+	"""	(deprecated function) Adds an infinite vertical line series to a plot.
+
+	Args:
+		x (Any): 
+		label (str, optional): Overrides 'name' as label.
+		user_data (Any, optional): User data for callbacks
+		use_internal_label (bool, optional): Use generated internal label instead of user specified (appends ### uuid).
+		tag (Union[int, str], optional): Unique id used to programmatically refer to the item.If label is unused this will be the label.
+		parent (Union[int, str], optional): Parent to add this item to. (runtime adding)
+		before (Union[int, str], optional): This item will be displayed before the specified item in the parent.
+		source (Union[int, str], optional): Overrides 'id' as value storage key.
+		show (bool, optional): Attempt to render widget.
+		id (Union[int, str], optional): (deprecated)
+	Returns:
+		Union[int, str]
+	"""
+
+	return internal_dpg.add_inf_line_series(x, **kwargs)
+
 
 @deprecated("Use: `add_child_window()`")
 def add_child(**kwargs):

docs/source/documentation/container-slots.rst

@@ -31,7 +31,7 @@ Items are stored in target slots within their parent container.
 Below is the breakdown of slots:
 
 Slot 0:
-    **mvFileExtension**, **mvFontRangeHint**, **mvNodeLink**, **mvAnnotation**, **mvDragLine**, **mvDragPoint**, **mvLegend**, **mvTableColumn**
+    **mvFileExtension**, **mvFontRangeHint**, **mvNodeLink**, **mvAnnotation**, **mvDragLine**, **mvDragRect**, **mvDragPoint**, **mvLegend**, **mvTableColumn**
 Slot 1:
   Most items
 Slot 2:

docs/source/documentation/plots.rst

@@ -133,6 +133,10 @@ The following commands can be used to control the plot axes limits
 * `get_axis_limits(...)`
 * `set_axis_limits_auto(...)`
 * `fit_axis_data(...)`
+* `set_axis_limits_constraints(...)`
+* `reset_axis_limits_constraints(...)`
+* `set_axis_zoom_constraints(...)`
+* `reset_axis_zoom_constraints(...)`
 
 An example demonstrating some of this can be found below:
 
@@ -239,11 +243,11 @@ Plots can contain up to Three Y-axis for different data that needs a different s
             dpg.add_line_series(sindatax, sindatay, label="y1 lines", parent=dpg.last_item())
 
             # create y axis 2
-            dpg.add_plot_axis(dpg.mvYAxis, label="y2")
+            dpg.add_plot_axis(dpg.mvYAxis2, label="y2")
             dpg.add_stem_series(sindatax, sindatay, label="y2 stem", parent=dpg.last_item())
 
             # create y axis 3
-            dpg.add_plot_axis(dpg.mvYAxis, label="y3 scatter")
+            dpg.add_plot_axis(dpg.mvYAxis3, label="y3 scatter")
             dpg.add_scatter_series(sindatax, sindatay, label="y3", parent=dpg.last_item())
 
     dpg.create_viewport(title='Custom Title', width=800, height=600)
@@ -338,17 +342,17 @@ Querying
 --------
 
 Querying allows the user to select a region of the plot by
-clicking and dragging the middle mouse button.
+holding with the right mouse button and clicking with the left one.
 
 Querying requires setting *query* to **True** when creating the plot.
 
 The callback of the plot will run when the plot is being queried.
 
-The query area is sent through the *app_data* argument as *(x_min, x_max, y_min, y_max)*.
+All the query areas are sent through the *app_data* argument as 
+*[(x_min, x_max, y_min, y_max), (x_min, x_max, y_min, y_max), ...]*.
 
-It is also possible to poll the plot for the query area by calling:
-:py:func:`get_plot_query_area <dearpygui.dearpygui.get_plot_query_area>` and
-:py:func:`is_plot_queried <dearpygui.dearpygui.is_plot_queried>`.
+It is also possible to poll the plot for the query areas by calling:
+:py:func:`get_plot_query_rects <dearpygui.dearpygui.get_plot_query_rects>` and
 
 Below is an example using the callback
 

docs/source/documentation/themes.rst

@@ -297,18 +297,18 @@ mvThemeCol_SliderGrab           mvThemeCol_ModalWindowDimBg
 Plot Colors
 -----------
 
-======================= ====================== ====================
+======================= ====================== =======================
 Plot Colors
-======================= ====================== ====================
-mvPlotCol_Line          mvPlotCol_LegendBg     mvPlotCol_YAxisGrid
-mvPlotCol_Fill          mvPlotCol_LegendBorder mvPlotCol_YAxis2
-mvPlotCol_MarkerOutline mvPlotCol_LegendText   mvPlotCol_YAxisGrid2
-mvPlotCol_MarkerFill    mvPlotCol_TitleText    mvPlotCol_YAxis3
-mvPlotCol_ErrorBar      mvPlotCol_InlayText    mvPlotCol_YAxisGrid3
-mvPlotCol_FrameBg       mvPlotCol_XAxis        mvPlotCol_Selection
-mvPlotCol_PlotBg        mvPlotCol_XAxisGrid    mvPlotCol_Query
-mvPlotCol_PlotBorder    mvPlotCol_YAxis        mvPlotCol_Crosshairs
-======================= ====================== ====================
+======================= ====================== =======================
+mvPlotCol_Line          mvPlotCol_LegendBg     mvPlotCol_AxisBgHovered
+mvPlotCol_Fill          mvPlotCol_LegendBorder mvPlotCol_AxisGrid
+mvPlotCol_MarkerOutline mvPlotCol_LegendText   mvPlotCol_AxisText
+mvPlotCol_MarkerFill    mvPlotCol_TitleText    mvPlotCol_Selection
+mvPlotCol_ErrorBar      mvPlotCol_InlayText    
+mvPlotCol_FrameBg       mvPlotCol_AxisBg       
+mvPlotCol_PlotBg        mvPlotCol_AxisBgActive 
+mvPlotCol_PlotBorder    mvPlotCol_Crosshairs        
+======================= ====================== =======================
 
 Node Colors
 -----------
@@ -327,34 +327,42 @@ mvNodeCol_TitleBarHovered
 Core Styles
 -----------
 
-============================== ==========
-Constant                       Components
-============================== ==========
-mvStyleVar_Alpha               1
-mvStyleVar_WindowPadding       2
-mvStyleVar_WindowRounding      1
-mvStyleVar_WindowBorderSize    1
-mvStyleVar_WindowMinSize       2
-mvStyleVar_WindowTitleAlign    2
-mvStyleVar_ChildRounding       1
-mvStyleVar_ChildBorderSize     1
-mvStyleVar_PopupRounding       1
-mvStyleVar_PopupBorderSize     1
-mvStyleVar_FramePadding        2
-mvStyleVar_FrameRounding       1
-mvStyleVar_FrameBorderSize     1
-mvStyleVar_ItemSpacing         2
-mvStyleVar_ItemInnerSpacing    2
-mvStyleVar_IndentSpacing       1
-mvStyleVar_CellPadding         2
-mvStyleVar_ScrollbarSize       1
-mvStyleVar_ScrollbarRounding   1
-mvStyleVar_GrabMinSize         1
-mvStyleVar_GrabRounding        1
-mvStyleVar_TabRounding         1
-mvStyleVar_ButtonTextAlign     2
-mvStyleVar_SelectableTextAlign 2
-============================== ==========
+======================================= ==========
+Constant                                Components
+======================================= ==========
+mvStyleVar_Alpha                        1
+mvStyleVar_DisabledAlpha                1
+mvStyleVar_WindowPadding                2
+mvStyleVar_WindowRounding               1
+mvStyleVar_WindowBorderSize             1
+mvStyleVar_WindowMinSize                2
+mvStyleVar_WindowTitleAlign             2
+mvStyleVar_ChildRounding                1
+mvStyleVar_ChildBorderSize              1
+mvStyleVar_PopupRounding                1
+mvStyleVar_PopupBorderSize              1
+mvStyleVar_FramePadding                 2
+mvStyleVar_FrameRounding                1
+mvStyleVar_FrameBorderSize              1
+mvStyleVar_ItemSpacing                  2
+mvStyleVar_ItemInnerSpacing             2
+mvStyleVar_IndentSpacing                1
+mvStyleVar_CellPadding                  2
+mvStyleVar_ScrollbarSize                1
+mvStyleVar_ScrollbarRounding            1
+mvStyleVar_GrabMinSize                  1
+mvStyleVar_GrabRounding                 1
+mvStyleVar_TabRounding                  1
+mvStyleVar_TabBorderSize                1
+mvStyleVar_TabBarBorderSize             1
+mvStyleVar_TableAngledHeadersAngle      1
+mvStyleVar_TableAngledHeadersTextAlign  2
+mvStyleVar_ButtonTextAlign              2
+mvStyleVar_SelectableTextAlign          2
+mvStyleVar_SeparatorTextBorderSize      1
+mvStyleVar_SeparatorTextAlign           2
+mvStyleVar_SeparatorTextPadding         2
+======================================= ==========
 
 Plot Styles
 -----------

sandbox/main.cpp

@@ -3,7 +3,6 @@
 #include "dearpygui.h"
 #include "mvContext.h"
 #include <Windows.h>
-#include <iostream>
 #include <fstream>
 #include <string>
 #include <sstream>

sandbox/main_linux.cpp

@@ -2,7 +2,6 @@
 #include <Python.h>
 #include "dearpygui.h"
 #include "mvViewport.h"
-#include <iostream>
 #include <fstream>
 #include <string>
 #include <sstream>

src/CMakeLists.txt

@@ -49,6 +49,7 @@ set(MARVEL_SOURCES
         "mvAboutWindow.cpp"
         "mvDocWindow.cpp"
         "mvMetricsWindow.cpp"
+        "mvStackWindow.cpp"
         "mvStyleWindow.cpp"
         "mvDebugWindow.cpp"
         "mvLayoutWindow.cpp"
@@ -88,7 +89,9 @@ set(MARVEL_SOURCES
         "$<$<PLATFORM_ID:Darwin>:../thirdparty/imgui/backends/imgui_impl_glfw.cpp>"
         "$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/backends/imgui_impl_glfw.cpp>"
         "$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/backends/imgui_impl_opengl3.cpp>"
-        "$<$<PLATFORM_ID:Linux>:../thirdparty/imgui/examples/libs/gl3w/GL/gl3w.c>"
+
+        # gl3w
+        "$<$<PLATFORM_ID:Linux>:../thirdparty/gl3w/GL/gl3w.c>"
         )
 
 set(MARVEL_INCLUDE_DIR
@@ -103,7 +106,6 @@ set(MARVEL_INCLUDE_DIR
         "../thirdparty/gl3w/"
         "../thirdparty/imgui/misc/freetype/"
         "../thirdparty/imgui/backends/"
-        "../thirdparty/imgui/examples/libs/gl3w"
         "../thirdparty/cpython/"
         "../thirdparty/cpython/Include/"
         "../thirdparty/cpython/build/debug/"