meltygui-imgui 2.0.2__tar.gz → 2.0.3__tar.gz

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meltygui-imgui
-Version: 2.0.2
+Version: 2.0.3
 Summary: Cython-based Python bindings for dear meltygui_imgui
 Home-page: https://github.com/Attentio-AI/meltygui-imgui
 Author: Michał Jaworski
@@ -45,14 +45,14 @@ Requires-Dist: PyOpenGL; extra == "pyglet"
 Requires-Dist: pyglet; sys_platform != "darwin" and extra == "pyglet"
 Requires-Dist: pyglet>=1.5.6; sys_platform == "darwin" and extra == "pyglet"
 Provides-Extra: full
-Requires-Dist: glfw; extra == "full"
+Requires-Dist: PyOpenGL; extra == "full"
 Requires-Dist: cocos2d; extra == "full"
-Requires-Dist: pyglet; sys_platform != "darwin" and extra == "full"
-Requires-Dist: pyglet>=1.5.6; sys_platform == "darwin" and extra == "full"
 Requires-Dist: Cython<0.30,>=0.24; extra == "full"
+Requires-Dist: glfw; extra == "full"
 Requires-Dist: pygame; extra == "full"
+Requires-Dist: pyglet>=1.5.6; sys_platform == "darwin" and extra == "full"
+Requires-Dist: pyglet; sys_platform != "darwin" and extra == "full"
 Requires-Dist: PySDL2; extra == "full"
-Requires-Dist: PyOpenGL; extra == "full"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/README.md

@@ -29,6 +29,18 @@ missing wheel an error rather than a compilation.
 
 The bundled Dear ImGui and font-helper license notices are included in the artifacts.
 
+## Fractional coordinates (2.0.3)
+
+The maintained binding retains fractional mouse, window, scroll and cursor
+positions. Text origins align to physical framebuffer pixels only when drawing,
+restoring crisp 1x text and allowing pixel-sized steps on Retina displays without
+rounding scroll offsets or interaction coordinates. Applications and font sizes
+still use logical coordinates. Rebuild the native extension on
+each target platform when upgrading; copying Python modules is insufficient.
+Hosts that interpolate a dense font atlas can define
+`IMGUI_ENABLE_FRACTIONAL_TEXT`; Hub's iOS Retina runtime does this to retain
+continuous touch scrolling.
+
 ## IntelliJ IDEA / PyCharm
 
 The package ships `.pyi` signatures for its native extensions, including the

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/imgui-cpp/imgui.cpp

@@ -772,6 +772,7 @@ CODE
 #define IMGUI_DEFINE_MATH_OPERATORS
 #endif
 #include "imgui_internal.h"
+// Melty subpixel coordinates: keep logical positions fractional through rasterization.
 
 // System includes
 #include <ctype.h>      // toupper
@@ -3623,7 +3624,7 @@ static void ImGui::UpdateMouseInputs()
 
     // Round mouse position to avoid spreading non-rounded position (e.g. UpdateManualResize doesn't support them well)
     if (IsMousePosValid(&g.IO.MousePos))
-        g.IO.MousePos = g.LastValidMousePos = ImFloor(g.IO.MousePos);
+        g.LastValidMousePos = g.IO.MousePos;
 
     // If mouse just appeared or disappeared (usually denoted by -FLT_MAX components) we cancel out movement in MouseDelta
     if (IsMousePosValid(&g.IO.MousePos) && IsMousePosValid(&g.IO.MousePosPrev))
@@ -5982,7 +5983,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         if (!window_pos_set_by_api && !(flags & ImGuiWindowFlags_ChildWindow) && window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0)
             if (viewport_rect.GetWidth() > 0.0f && viewport_rect.GetHeight() > 0.0f)
                 ClampWindowRect(window, visibility_rect);
-        window->Pos = ImFloor(window->Pos);
+        // Keep the fractional position of children inside a scrolling parent.
 
         // Lock window rounding for the frame (so that altering them doesn't cause inconsistencies)
         // Large values tend to lead to variety of artifacts and are not recommended.
@@ -6162,8 +6163,8 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         const bool allow_scrollbar_y = !(flags & ImGuiWindowFlags_NoScrollbar);
         const float work_rect_size_x = (window->ContentSizeExplicit.x != 0.0f ? window->ContentSizeExplicit.x : ImMax(allow_scrollbar_x ? window->ContentSize.x : 0.0f, window->Size.x - window->WindowPadding.x * 2.0f - window->ScrollbarSizes.x));
         const float work_rect_size_y = (window->ContentSizeExplicit.y != 0.0f ? window->ContentSizeExplicit.y : ImMax(allow_scrollbar_y ? window->ContentSize.y : 0.0f, window->Size.y - window->WindowPadding.y * 2.0f - decoration_up_height - window->ScrollbarSizes.y));
-        window->WorkRect.Min.x = ImFloor(window->InnerRect.Min.x - window->Scroll.x + ImMax(window->WindowPadding.x, window->WindowBorderSize));
-        window->WorkRect.Min.y = ImFloor(window->InnerRect.Min.y - window->Scroll.y + ImMax(window->WindowPadding.y, window->WindowBorderSize));
+        window->WorkRect.Min.x = window->InnerRect.Min.x - window->Scroll.x + ImMax(window->WindowPadding.x, window->WindowBorderSize);
+        window->WorkRect.Min.y = window->InnerRect.Min.y - window->Scroll.y + ImMax(window->WindowPadding.y, window->WindowBorderSize);
         window->WorkRect.Max.x = window->WorkRect.Min.x + work_rect_size_x;
         window->WorkRect.Max.y = window->WorkRect.Min.y + work_rect_size_y;
         window->ParentWorkRect = window->WorkRect;
@@ -6671,7 +6672,7 @@ void ImGui::SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond)
 
     // Set
     const ImVec2 old_pos = window->Pos;
-    window->Pos = ImFloor(pos);
+    window->Pos = pos;
     ImVec2 offset = window->Pos - old_pos;
     window->DC.CursorPos += offset;         // As we happen to move the window while it is being appended to (which is a bad idea - will smear) let's at least offset the cursor
     window->DC.CursorMaxPos += offset;      // And more importantly we need to offset CursorMaxPos/CursorStartPos this so ContentSize calculation doesn't get affected.
@@ -7307,8 +7308,8 @@ void ImGui::ItemSize(const ImVec2& size, float text_baseline_y)
     //if (g.IO.KeyAlt) window->DrawList->AddRect(window->DC.CursorPos, window->DC.CursorPos + ImVec2(size.x, line_height), IM_COL32(255,0,0,200)); // [DEBUG]
     window->DC.CursorPosPrevLine.x = window->DC.CursorPos.x + size.x;
     window->DC.CursorPosPrevLine.y = window->DC.CursorPos.y;
-    window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);    // Next line
-    window->DC.CursorPos.y = IM_FLOOR(window->DC.CursorPos.y + line_height + g.Style.ItemSpacing.y);        // Next line
+    window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;    // Next line
+    window->DC.CursorPos.y = window->DC.CursorPos.y + line_height + g.Style.ItemSpacing.y;        // Next line
     window->DC.CursorMaxPos.x = ImMax(window->DC.CursorMaxPos.x, window->DC.CursorPosPrevLine.x);
     window->DC.CursorMaxPos.y = ImMax(window->DC.CursorMaxPos.y, window->DC.CursorPos.y - g.Style.ItemSpacing.y);
     //if (g.IO.KeyAlt) window->DrawList->AddCircle(window->DC.CursorMaxPos, 3.0f, IM_COL32(255,0,0,255), 4); // [DEBUG]
@@ -7779,8 +7780,8 @@ static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window)
             scroll_target_y = CalcScrollEdgeSnap(scroll_target_y, snap_y_min, snap_y_max, window->ScrollTargetEdgeSnapDist.y, center_y_ratio);
         scroll.y = scroll_target_y - center_y_ratio * (window->SizeFull.y - window->ScrollbarSizes.y - decoration_up_height);
     }
-    scroll.x = IM_FLOOR(ImMax(scroll.x, 0.0f));
-    scroll.y = IM_FLOOR(ImMax(scroll.y, 0.0f));
+    scroll.x = ImMax(scroll.x, 0.0f);
+    scroll.y = ImMax(scroll.y, 0.0f);
     if (!window->Collapsed && !window->SkipItems)
     {
         scroll.x = ImMin(scroll.x, window->ScrollMax.x);
@@ -7882,7 +7883,7 @@ void ImGui::SetScrollY(float scroll_y)
 void ImGui::SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio)
 {
     IM_ASSERT(center_x_ratio >= 0.0f && center_x_ratio <= 1.0f);
-    window->ScrollTarget.x = IM_FLOOR(local_x + window->Scroll.x); // Convert local position to scroll offset
+    window->ScrollTarget.x = local_x + window->Scroll.x; // Convert local position to scroll offset
     window->ScrollTargetCenterRatio.x = center_x_ratio;
     window->ScrollTargetEdgeSnapDist.x = 0.0f;
 }
@@ -7891,7 +7892,7 @@ void ImGui::SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y
 {
     IM_ASSERT(center_y_ratio >= 0.0f && center_y_ratio <= 1.0f);
     local_y -= window->TitleBarHeight() + window->MenuBarHeight(); // FIXME: Would be nice to have a more standardized access to our scrollable/client rect
-    window->ScrollTarget.y = IM_FLOOR(local_y + window->Scroll.y); // Convert local position to scroll offset
+    window->ScrollTarget.y = local_y + window->Scroll.y; // Convert local position to scroll offset
     window->ScrollTargetCenterRatio.y = center_y_ratio;
     window->ScrollTargetEdgeSnapDist.y = 0.0f;
 }

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/imgui-cpp/imgui_draw.cpp

@@ -34,6 +34,7 @@ Index of this file:
 #endif
 
 #include "imgui_internal.h"
+// Melty subpixel coordinates: keep layout/input fractional; align text at rasterization.
 #ifdef IMGUI_ENABLE_FREETYPE
 #include "misc/freetype/imgui_freetype.h"
 #endif
@@ -3469,6 +3470,23 @@ ImVec2 ImFont::CalcTextSizeA(float size, float max_width, float wrap_width, cons
     return text_size;
 }
 
+// Melty text pixel alignment: quantize only the glyph origin, in framebuffer
+// pixels. Layout, scroll offsets and hit testing keep their fractional values.
+static ImVec2 ImFontSnapToPixelGrid(const ImVec2& pos)
+{
+#ifdef IMGUI_ENABLE_FRACTIONAL_TEXT
+    // The iOS runtime opts into continuous motion with its dense font atlas.
+    return pos;
+#else
+    const ImVec2 scale = GImGui ? GImGui->IO.DisplayFramebufferScale : ImVec2(1.0f, 1.0f);
+    const ImVec2 origin = GImGui ? ImGui::GetMainViewport()->Pos : ImVec2(0.0f, 0.0f);
+    const float sx = scale.x > 0.0f ? scale.x : 1.0f;
+    const float sy = scale.y > 0.0f ? scale.y : 1.0f;
+    return ImVec2(origin.x + ImFloorStd((pos.x - origin.x) * sx) / sx,
+                  origin.y + ImFloorStd((pos.y - origin.y) * sy) / sy);
+#endif
+}
+
 void ImFont::RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col, ImWchar c) const
 {
     const ImFontGlyph* glyph = FindGlyph(c);
@@ -3477,8 +3495,7 @@ void ImFont::RenderChar(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col
     if (glyph->Colored)
         col |= ~IM_COL32_A_MASK;
     float scale = (size >= 0.0f) ? (size / FontSize) : 1.0f;
-    pos.x = IM_FLOOR(pos.x);
-    pos.y = IM_FLOOR(pos.y);
+    pos = ImFontSnapToPixelGrid(pos);
     draw_list->PrimReserve(6, 4);
     draw_list->PrimRectUV(ImVec2(pos.x + glyph->X0 * scale, pos.y + glyph->Y0 * scale), ImVec2(pos.x + glyph->X1 * scale, pos.y + glyph->Y1 * scale), ImVec2(glyph->U0, glyph->V0), ImVec2(glyph->U1, glyph->V1), col);
 }
@@ -3488,9 +3505,8 @@ void ImFont::RenderText(ImDrawList* draw_list, float size, ImVec2 pos, ImU32 col
     if (!text_end)
         text_end = text_begin + strlen(text_begin); // ImGui:: functions generally already provides a valid text_end, so this is merely to handle direct calls.
 
-    // Align to be pixel perfect
-    pos.x = IM_FLOOR(pos.x);
-    pos.y = IM_FLOOR(pos.y);
+    // Align glyphs to physical pixels without rounding the logical cursor.
+    pos = ImFontSnapToPixelGrid(pos);
     float x = pos.x;
     float y = pos.y;
     if (y > clip_rect.w)

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/imgui-cpp/imgui_tables.cpp

@@ -3795,7 +3795,7 @@ void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiOldColumnFl
     float width = offset_1 - offset_0;
     PushItemWidth(width * 0.65f);
     window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f);
-    window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
+    window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;
     window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding;
 }
 
@@ -3810,7 +3810,7 @@ void ImGui::NextColumn()
 
     if (columns->Count == 1)
     {
-        window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
+        window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;
         IM_ASSERT(columns->Current == 0);
         return;
     }
@@ -3841,7 +3841,7 @@ void ImGui::NextColumn()
         window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f);
         columns->LineMinY = columns->LineMaxY;
     }
-    window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
+    window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;
     window->DC.CursorPos.y = columns->LineMinY;
     window->DC.CurrLineSize = ImVec2(0.0f, 0.0f);
     window->DC.CurrLineTextBaseOffset = 0.0f;
@@ -3927,7 +3927,7 @@ void ImGui::EndColumns()
     window->ParentWorkRect = columns->HostBackupParentWorkRect;
     window->DC.CurrentColumns = NULL;
     window->DC.ColumnsOffset.x = 0.0f;
-    window->DC.CursorPos.x = IM_FLOOR(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
+    window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;
 }
 
 void ImGui::Columns(int columns_count, const char* id, bool border)

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/meltygui_imgui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meltygui-imgui
-Version: 2.0.2
+Version: 2.0.3
 Summary: Cython-based Python bindings for dear meltygui_imgui
 Home-page: https://github.com/Attentio-AI/meltygui-imgui
 Author: Michał Jaworski
@@ -45,14 +45,14 @@ Requires-Dist: PyOpenGL; extra == "pyglet"
 Requires-Dist: pyglet; sys_platform != "darwin" and extra == "pyglet"
 Requires-Dist: pyglet>=1.5.6; sys_platform == "darwin" and extra == "pyglet"
 Provides-Extra: full
-Requires-Dist: glfw; extra == "full"
+Requires-Dist: PyOpenGL; extra == "full"
 Requires-Dist: cocos2d; extra == "full"
-Requires-Dist: pyglet; sys_platform != "darwin" and extra == "full"
-Requires-Dist: pyglet>=1.5.6; sys_platform == "darwin" and extra == "full"
 Requires-Dist: Cython<0.30,>=0.24; extra == "full"
+Requires-Dist: glfw; extra == "full"
 Requires-Dist: pygame; extra == "full"
+Requires-Dist: pyglet>=1.5.6; sys_platform == "darwin" and extra == "full"
+Requires-Dist: pyglet; sys_platform != "darwin" and extra == "full"
 Requires-Dist: PySDL2; extra == "full"
-Requires-Dist: PyOpenGL; extra == "full"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/meltygui_imgui.egg-info/SOURCES.txt

@@ -102,6 +102,7 @@ tests/test_crazy_callbacks.py
 tests/test_graphics_mem_safety.py
 tests/test_gui_style_initialization.py
 tests/test_stub_signatures.py
+tests/test_text_pixel_alignment.py
 tools/build.py
 tools/build_in_container.sh
 tools/build_windows.py

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/setup.py

@@ -174,7 +174,7 @@ EXTENSIONS = [
 
 setup(
     name="meltygui-imgui",
-    version="2.0.2",
+    version="2.0.3",
     python_requires=">=3.11,<3.14",
     packages=find_packages('.'),
     package_data={"meltygui_imgui": ["*.pyi", "py.typed"]},

meltygui_imgui-2.0.3/tests/test_text_pixel_alignment.py

@@ -0,0 +1,81 @@
+"""Raster alignment must not quantize ImGui's layout or input state."""
+import ctypes
+import math
+import struct
+import unittest
+
+import meltygui_imgui as imgui
+
+
+def vertices(draw):
+    data = ctypes.string_at(draw.vtx_buffer_data, draw.vtx_buffer_size * imgui.VERTEX_SIZE)
+    return [struct.unpack_from('ff', data, i * imgui.VERTEX_SIZE + imgui.VERTEX_BUFFER_POS_OFFSET)
+            for i in range(draw.vtx_buffer_size)]
+
+
+class TextPixelAlignmentTests(unittest.TestCase):
+    def setUp(self):
+        self.context = imgui.create_context()
+        self.io = imgui.get_io()
+        self.io.ini_file_name = None
+        self.io.display_size = (400, 400)
+        self.io.delta_time = 1 / 60
+        self.io.fonts.get_tex_data_as_rgba32()
+        self.io.fonts.texture_id = 1
+
+    def tearDown(self):
+        imgui.destroy_context(self.context)
+
+    def draw(self, position, text=True):
+        imgui.new_frame()
+        draw = imgui.get_foreground_draw_list()
+        x, y = position
+        if text:
+            draw.add_text(x, y, 0xffffffff, 'Crisp text\nSecond line')
+        else:
+            draw.add_rect_filled(x, y, x + 40, y + 20, 0xffffffff)
+        result = vertices(draw)
+        imgui.render()
+        return result
+
+    def test_fractional_text_matches_pixel_aligned_text_at_each_density(self):
+        for scale in ((1, 1), (1.25, 1.5), (2, 2), (3, 3)):
+            self.io.display_fb_scale = scale
+            for fraction in (.125, .25, .5, .875):
+                with self.subTest(scale=scale, fraction=fraction):
+                    pos = (50 + fraction, 61 + fraction)
+                    aligned = tuple(math.floor(v * s) / s for v, s in zip(pos, scale))
+                    actual = self.draw(pos)
+                    self.assertTrue(actual)
+                    self.assertEqual(actual, self.draw(aligned))
+
+    def test_shapes_and_pointer_coordinates_remain_fractional(self):
+        self.io.mouse_pos = (51.25, 62.125)
+        before = self.draw((50, 60), text=False)
+        after = self.draw((50.125, 60.125), text=False)
+        for first, second in zip(before, after):
+            self.assertEqual(tuple(b - a for a, b in zip(first, second)), (.125, .125))
+        self.assertEqual(tuple(self.io.mouse_pos), (51.25, 62.125))
+
+    def test_child_scroll_and_cursor_keep_subpixel_precision(self):
+        def frame():
+            imgui.new_frame()
+            imgui.set_next_window_position(0, 0)
+            imgui.set_next_window_size(400, 400)
+            with imgui.begin('Host', flags=imgui.WINDOW_NO_DECORATION):
+                with imgui.begin_child('Child', 250, 250, flags=imgui.WINDOW_HORIZONTAL_SCROLLING_BAR):
+                    result = (imgui.get_scroll_x(), imgui.get_scroll_y(), tuple(imgui.get_cursor_screen_pos()))
+                    imgui.dummy(1000, 1000)
+                    imgui.set_scroll_x(50.125)
+                    imgui.set_scroll_y(60.375)
+            imgui.render()
+            return result
+        for _ in range(4):
+            x, y, cursor = frame()
+        self.assertEqual((x, y), (50.125, 60.375))
+        self.assertAlmostEqual(cursor[0] % 1, .875)
+        self.assertAlmostEqual(cursor[1] % 1, .625)
+
+
+if __name__ == '__main__':
+    unittest.main()

{meltygui_imgui-2.0.2 → meltygui_imgui-2.0.3}/meltygui_imgui.egg-info/requires.txt

@@ -10,12 +10,12 @@ cocos2d
 pyglet>=1.5.6
 
 [full]
-glfw
+PyOpenGL
 cocos2d
 Cython<0.30,>=0.24
+glfw
 pygame
 PySDL2
-PyOpenGL
 
 [full:sys_platform != "darwin"]
 pyglet