Widths in WX_GRID_AUTOSIZER should account for dpi scaling

8 months ago · a7f5fc45e7
2 changed files with 4 additions and 3 deletions
--- a/common/widgets/wx_grid_autosizer.cpp
+++ b/common/widgets/wx_grid_autosizer.cpp
@ -78,11 +78,13 @@ void WX_GRID_AUTOSIZER::recomputeGridWidths()
        {
            m_grid.AutoSizeColumn( colIndex );
            const int colSize = m_grid.GetColSize( colIndex );
-            m_grid.SetColSize( colIndex, std::max( minWidth, colSize ) );
+
+            int minWidthScaled = m_grid.FromDIP( minWidth );
+            m_grid.SetColSize( colIndex, std::max( minWidthScaled, colSize ) );

            if( colIndex == m_flexibleCol )
            {
-                flexibleMinWidth = minWidth;
+                flexibleMinWidth = minWidthScaled;
            }
        }

--- a/vcpkg.json
+++ b/vcpkg.json
@ -41,7 +41,6 @@
    },
    "icu",
    "ngspice",
-    "wxpython",
    "libgit2",
    "nng",
    "protobuf",