Merge branch 'hoffstadt:master' into patch-1

Author: Jah-On

CMakeLists.txt

@@ -1,15 +1,22 @@
-cmake_minimum_required (VERSION 3.13)
+cmake_minimum_required (VERSION 3.16)
 
-project ("DearPyGui")
+if(APPLE)
+    # When using precompiled headers on macOS, we need to enable Objective-C
+    # as a distinct language. This won't work on other platforms (will fail to
+    # find the Obj-C compiler), hence the "if APPLE".
+    project ("DearPyGui" LANGUAGES C CXX OBJC OBJCXX)
+else()
+    project ("DearPyGui")
+endif()
 
 if(WIN32)
-    add_definitions(-DIMGUI_USER_CONFIG="mvImGuiConfig.h")
+    add_definitions(-DIMGUI_USER_CONFIG="mvImGuiConfig_win32.h")
     add_definitions(-DMV_PLATFORM="windows")
 elseif(APPLE)
-    add_definitions(-DIMGUI_USER_CONFIG="mvImGuiLinuxConfig.h")
+    add_definitions(-DIMGUI_USER_CONFIG="mvImGuiConfig_apple.h")
     add_definitions(-DMV_PLATFORM="apple")
 else() # Linux
-	add_definitions(-DIMGUI_USER_CONFIG="mvImGuiLinuxConfig.h")
+	add_definitions(-DIMGUI_USER_CONFIG="mvImGuiConfig_linux.h")
     add_definitions(-DMV_PLATFORM="linux")
 endif()
 
@@ -20,6 +27,7 @@ endif()
 
 # various settings
 add_definitions(
+    -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
     -D_CRT_SECURE_NO_WARNINGS 
     -D_USE_MATH_DEFINES)
 

dearpygui/_dearpygui.pyi

@@ -423,3 +423,55 @@ def is_item_search_delayed(item: Union[int, str]) -> Union[bool, None]:
 def set_start_callback(callback):
     """ deprecated function """
     return internal_dpg.set_frame_callback(3, callback)
+
+@deprecated("This call is a no-op because character ranges are now automatic")
+def add_font_chars(chars : Union[List[int], Tuple[int, ...]], *, label: str =None, user_data: Any =None, use_internal_label: bool =True, tag: Union[int, str] =0, parent: Union[int, str] =0, **kwargs) -> Union[int, str]:
+	"""	(deprecated function) Adds specific font characters to a font.
+
+	Args:
+		chars (Union[List[int], Tuple[int, ...]]): 
+		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)
+		id (Union[int, str], optional): (deprecated) 
+	Returns:
+		Union[int, str]
+	"""
+	pass
+
+@deprecated("This call is a no-op because character ranges are now automatic")
+def add_font_range(first_char : int, last_char : int, *, label: str =None, user_data: Any =None, use_internal_label: bool =True, tag: Union[int, str] =0, parent: Union[int, str] =0, **kwargs) -> Union[int, str]:
+	"""	(deprecated function)  Adds a range of font characters to a font.
+
+	Args:
+		first_char (int): 
+		last_char (int): 
+		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)
+		id (Union[int, str], optional): (deprecated) 
+	Returns:
+		Union[int, str]
+	"""
+	pass
+
+@deprecated("This call is a no-op because character ranges are now automatic")
+def add_font_range_hint(hint : int, *, label: str =None, user_data: Any =None, use_internal_label: bool =True, tag: Union[int, str] =0, parent: Union[int, str] =0, **kwargs) -> Union[int, str]:
+	"""	(deprecated function)  Adds a range of font characters (mvFontRangeHint_ constants).
+
+	Args:
+		hint (int): 
+		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)
+		id (Union[int, str], optional): (deprecated) 
+	Returns:
+		Union[int, str]
+	"""
+	pass

dearpygui/_dearpygui_RTD.py

@@ -476,7 +476,7 @@ def _color_picker_configs(sender, value, user_data):
                     dpg.add_radio_button(("mvColorEdit_input_rgb", "mvColorEdit_input_hsv"), callback=_color_picker_configs, 
                                          user_data=_color_picker_id, horizontal=True)
 
-                dpg.add_color_picker((255, 0, 255, 200), label="Color Picker", alpha_preview=True, no_alpha=False, alpha_bar=True, 
+                dpg.add_color_picker((255, 0, 255, 200), label="Color Picker", alpha_preview=dpg.mvColorEdit_AlphaPreviewNone, no_alpha=False, alpha_bar=True, 
                         width=200, tag=_color_picker_id)
 
                 _add_config_options(_color_picker_id, 3, 

dearpygui/_deprecated.py

@@ -13,19 +13,26 @@ folder you can find an example of a otf font.
 Readme First
 ------------
 
-All loaded fonts glyphs are rendered into a single texture atlas ahead of time.
-Adding/Removing/Modifying fonts will cause the font atlas to be rebuilt.
+All loaded fonts glyphs are rendered into a single texture atlas. Rendering occurs
+on-the-fly as characters are encountered in UI strings (item labels, input contents, etc. -
+anything that gets displayed in the viewport).
 
-You can use the style editor
+You can use the Fonts Manager tool
 :py:func:`show_font_manager <dearpygui.dearpygui.show_font_manager>`
 to browse your fonts and understand what's going on if you have an issue.
 
 Font Loading Instructions
 -------------------------
 
 To add your own fonts, you must first create a font registry to
-add fonts to. Next, add fonts to the registry. By default only basic latin
-and latin supplement glyphs are added (0x0020 - 0x00FF).
+add fonts to. Next, add fonts to the registry.
+
+For a font to take effect, it must be either bound globally with :py:func:`bind_font <dearpygui.dearpygui.bind_font>`
+or bound to a particular item with :py:func:`bind_item_font <dearpygui.dearpygui.bind_item_font>`.
+In the latter case, the font is "inherited" by all child item if it is bound to
+a container. To remove font binding and revert to the default font (or inherit from
+the parent item), call `bind_font`/`bind_item_font` again, passing 0 in the `font`
+argument.
 
 .. code-block:: python
 
@@ -39,13 +46,14 @@ and latin supplement glyphs are added (0x0020 - 0x00FF).
         default_font = dpg.add_font("NotoSerifCJKjp-Medium.otf", 20)
         second_font = dpg.add_font("NotoSerifCJKjp-Medium.otf", 10)
 
+    dpg.bind_font(default_font)
+
     with dpg.window(label="Font Example", height=200, width=200):
         dpg.add_button(label="Default font")
         b2 = dpg.add_button(label="Secondary font")
         dpg.add_button(label="default")
 
         # set font of specific widget
-        dpg.bind_font(default_font)
         dpg.bind_item_font(b2, second_font)
 
     dpg.show_font_manager()
@@ -59,8 +67,19 @@ and latin supplement glyphs are added (0x0020 - 0x00FF).
 Loading Specific Unicode Characters
 -----------------------------------
 
-There are several ways to add specific characters from a font file.
-You can use range hints, ranges, and specific characters. You can also remap characters.
+.. note:: 
+    This section previously described how to load specific characters from font file
+    so that they are displayed in the UI correctly. Since DPG version 2.3, character
+    glyphs are rendered automatically and there is no need to specify them in advance.
+    This section is no longer relevant, and the functions `add_font_chars`, `add_font_range`,
+    and `add_font_range_hint` are obsolete and do nothing if you call them.
+
+Remapping Characters
+-----------------------------------
+
+For convenience, you can remap a character to a different character code and use
+this replacement in your text strings. In particular, it might be useful with icon
+fonts. Here is an example of how to do such remapping.
 
 .. code-block:: python
 
@@ -71,26 +90,6 @@ You can use range hints, ranges, and specific characters. You can also remap cha
     with dpg.font_registry():
         with dpg.font("NotoSerifCJKjp-Medium.otf", 20) as font1:
 
-            # add the default font range
-            dpg.add_font_range_hint(dpg.mvFontRangeHint_Default)
-
-            # helper to add range of characters
-            #    Options:
-            #        mvFontRangeHint_Japanese
-            #        mvFontRangeHint_Korean
-            #        mvFontRangeHint_Chinese_Full
-            #        mvFontRangeHint_Chinese_Simplified_Common
-            #        mvFontRangeHint_Cyrillic
-            #        mvFontRangeHint_Thai
-            #        mvFontRangeHint_Vietnamese
-            dpg.add_font_range_hint(dpg.mvFontRangeHint_Japanese)
-
-            # add specific range of glyphs
-            dpg.add_font_range(0x3100, 0x3ff0)
-
-            # add specific glyphs
-            dpg.add_font_chars([0x3105, 0x3107, 0x3108])
-
             # remap や to %
             dpg.add_char_remap(0x3084, 0x0025)
 

dearpygui/dearpygui.py

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.13)
+cmake_minimum_required (VERSION 3.16)
 
 add_executable (DearSandbox)
 

dearpygui/demo.py

@@ -16,8 +16,7 @@
 log.log_critical("log critical")
 
 with dpg.font_registry():
-    with dpg.font("../../assets/NotoSerifCJKjp-Medium.otf", 20, tag="custom font"):
-        dpg.add_font_range_hint(dpg.mvFontRangeHint_Default)
+    dpg.add_font("../../assets/NotoSerifCJKjp-Medium.otf", 20, tag="custom font")
     dpg.bind_font(dpg.last_container())
 
 demo.show_demo()