ejlersen/module-navigation-tool
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Activity

Fixed issue, where changing DPI scaling on monitor would detach visual elements from toolbar and not reattach/rebuild

Browse source
This commit is contained in:
Anders Ejlersen 2025-09-21 14:26:04 +02:00
parent a9576ce008
commit 708b99f763
4 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [1.11.4] - 2025-09-21
### Fixed
- Fixed issue, where changing DPI scaling on monitor would detach visual elements from toolbar and not reattach/rebuild
## [1.11.3] - 2025-05-11 ## [1.11.3] - 2025-05-11
### Changed ### Changed

2
Editor/Toolbar/ToolbarDrawer.cs
View file

@ -48,7 +48,7 @@ namespace Module.NavigationTool.Editor.Toolbar
} }
} }
#if UNITY_2021_1_OR_NEWER #if UNITY_2021_1_OR_NEWER
private static void OnUpdateElements(VisualElement leftAlign, VisualElement rightAlign) private static void OnUpdateElements(VisualElement leftAlign, VisualElement rightAlign)
{ {
const float HEIGHT = 22.0f; const float HEIGHT = 22.0f;

18
Editor/Toolbar/Utilities/ToolbarUtility.cs
View file

@ -27,6 +27,7 @@ namespace Module.NavigationTool.Editor.Toolbar
private static VisualElement CURRENT_PARENT_LEFT; private static VisualElement CURRENT_PARENT_LEFT;
private static VisualElement CURRENT_PARENT_RIGHT; private static VisualElement CURRENT_PARENT_RIGHT;
private static int CURRENT_INSTANCE_ID; private static int CURRENT_INSTANCE_ID;
private static FieldInfo FIELD_INFO_ROOT;
#endif #endif
#if UNITY_2021_1_OR_NEWER #if UNITY_2021_1_OR_NEWER
@ -59,8 +60,10 @@ namespace Module.NavigationTool.Editor.Toolbar
CURRENT_PARENT_RIGHT?.RemoveFromHierarchy(); CURRENT_PARENT_RIGHT?.RemoveFromHierarchy();
CURRENT_PARENT_RIGHT = null; CURRENT_PARENT_RIGHT = null;
FieldInfo root = CURRENT_TOOLBAR.GetType().GetField("m_Root", BindingFlags.NonPublic | BindingFlags.Instance); if (FIELD_INFO_ROOT == null)
object rawRoot = root?.GetValue(CURRENT_TOOLBAR); FIELD_INFO_ROOT = CURRENT_TOOLBAR.GetType().GetField("m_Root", BindingFlags.NonPublic | BindingFlags.Instance);
object rawRoot = FIELD_INFO_ROOT?.GetValue(CURRENT_TOOLBAR);
CURRENT_ROOT = rawRoot as VisualElement; CURRENT_ROOT = rawRoot as VisualElement;
if (CURRENT_ROOT != null) if (CURRENT_ROOT != null)
@ -121,6 +124,10 @@ namespace Module.NavigationTool.Editor.Toolbar
}); });
} }
#if UNITY_6000_0_OR_NEWER
result.RegisterCallbackOnce<DetachFromPanelEvent>(OnDetachedFromPanel);
#endif
parent.Add(result); parent.Add(result);
return result; return result;
} }
@ -219,5 +226,12 @@ namespace Module.NavigationTool.Editor.Toolbar
return list.ToArray(); return list.ToArray();
} }
#if UNITY_6000_0_OR_NEWER
private static void OnDetachedFromPanel(DetachFromPanelEvent evt)
{
CURRENT_INSTANCE_ID = -1;
}
#endif
} }
} }

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "com.module.navigationtool", "name": "com.module.navigationtool",
"version": "1.11.3", "version": "1.11.4",
"displayName": "Module.NavigationTool", "displayName": "Module.NavigationTool",
"description": "Support for navigation tools, like favorites, history and toolbars", "description": "Support for navigation tools, like favorites, history and toolbars",
"unity": "2019.2", "unity": "2019.2",