Skip to content

FIX: Update icon scaling in Input Actions window #2054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 22, 2024
Merged

FIX: Update icon scaling in Input Actions window #2054

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0024956
Round pixelsPerPoint up rather than down when calculating icon scale
tspiller Nov 20, 2024
72fe96f
Update CHANGELOG.md
tspiller Nov 20, 2024
3016ab5
Merge branch 'develop' into isxb-1213-correct-icon-scale-rounding
tspiller Nov 22, 2024
dd26df5
Merge branch 'develop' into isxb-1213-correct-icon-scale-rounding
tspiller Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ however, it has to be formatted properly to pass verification tests.
- Fixed missing documentation for source generated Input Action Assets. This is now generated as part of the source code generation step when "Generate C# Class" is checked in the importer inspector settings.
- Fixed pasting into an empty map list raising an exception. [ISXB-1150](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1150)
- Fixed pasting bindings into empty Input Action asset. [ISXB-1180](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1180)
- Fixed icon scaling in Input Actions window.

### Changed
- Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086).
Expand Down
2 changes: 1 addition & 1 deletion Packages/com.unity.inputsystem/InputSystem/Editor/Internal/GUIHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static void DrawLineSeparator(string label = null)
public static Texture2D LoadIcon(string name)
{
var skinPrefix = EditorGUIUtility.isProSkin ? "d_" : "";
var scale = Mathf.Clamp((int)EditorGUIUtility.pixelsPerPoint, 0, 4);
var scale = Mathf.Clamp(Mathf.CeilToInt(EditorGUIUtility.pixelsPerPoint), 0, 4);
var scalePostFix = scale > 1 ? $"@{scale}x" : "";
if (name.IndexOfAny(Path.GetInvalidFileNameChars()) > -1)
name = string.Join("_", name.Split(Path.GetInvalidFileNameChars()));
Expand Down