Win32: Fix listview cell bounds on Windows.

We have to account for the possibility of an MSAA provider on the header control.
madewokherd · Dec 17, 2024 · 224726b · 224726b
1 parent a2db33e
commit 224726b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/xalia/Win32/HwndListViewCellProvider.cs b/xalia/Win32/HwndListViewCellProvider.cs
@@ -100,16 +100,19 @@ public override UiDomValue EvaluateIdentifier(UiDomElement element, string ident
                             var header = ColumnHeader;
                             if (!(header is null))
                             {
-                                result = header.EvaluateIdentifier(identifier, Root, depends_on);
+                                if (identifier == "win32_x")
+                                    result = header.EvaluateIdentifier("x", Root, depends_on);
+                                else
+                                    result = header.EvaluateIdentifier("width", Root, depends_on);
                             }
                         }
                         if (result is UiDomInt && Column == 0) // identifier == "win32_width"
                         {
                             // Sometimes selectbounds spans multiple columns (wine bug?)
                             Row.Element.EvaluateIdentifier("win32_selectbounds_x", Root, depends_on).TryToInt(out var sb_x);
                             Row.Element.EvaluateIdentifier("win32_selectbounds_width", Root, depends_on).TryToInt(out var sb_width);
-                            ColumnHeader.EvaluateIdentifier("win32_x", Root, depends_on).TryToInt(out var header_x);
-                            ColumnHeader.EvaluateIdentifier("win32_width", Root, depends_on).TryToInt(out var header_width);
+                            ColumnHeader.EvaluateIdentifier("x", Root, depends_on).TryToInt(out var header_x);
+                            ColumnHeader.EvaluateIdentifier("width", Root, depends_on).TryToInt(out var header_width);
                             return new UiDomInt(Math.Min(header_x + header_width - sb_x, sb_width));
                         }
                         return result;