Skip to content

Fixed UI alignment of framesettings #1929

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 2 commits into from
Sep 25, 2020
Merged

Fixed UI alignment of framesettings #1929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6a2968
Fixed UI alignment of framesettings
adrien-de-tocqueville Sep 17, 2020
ed5c37e
Merge branch 'HDRP/staging' into HDRP/frame-settings-ui-alignment
sebastienlagarde Sep 25, 2020
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
6 changes: 4 additions & 2 deletions com.unity.render-pipelines.core/Editor/CoreEditorUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,14 +227,15 @@ public static void DrawMultipleFields(GUIContent label, SerializedProperty[] ppt
public static void DrawSplitter(bool isBoxed = false)
{
var rect = GUILayoutUtility.GetRect(1f, 1f);
float xMin = rect.xMin;

// Splitter rect should be full-width
rect.xMin = 0f;
rect.width += 4f;

if (isBoxed)
{
rect.xMin = EditorGUIUtility.singleLineHeight;
rect.xMin = xMin == 7.0 ? 4.0f : EditorGUIUtility.singleLineHeight;
rect.width -= 1;
}

Expand Down Expand Up @@ -299,6 +300,7 @@ public static bool DrawHeaderFoldout(GUIContent title, bool state, bool isBoxed
{
const float height = 17f;
var backgroundRect = GUILayoutUtility.GetRect(1f, height);
float xMin = backgroundRect.xMin;

var labelRect = backgroundRect;
labelRect.xMin += 16f;
Expand Down Expand Up @@ -328,7 +330,7 @@ public static bool DrawHeaderFoldout(GUIContent title, bool state, bool isBoxed
{
labelRect.xMin += 5;
foldoutRect.xMin += 5;
backgroundRect.xMin = EditorGUIUtility.singleLineHeight;
backgroundRect.xMin = xMin == 7.0 ? 4.0f : EditorGUIUtility.singleLineHeight;
backgroundRect.width -= 1;
}

Expand Down
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Close Add Override popup of Volume Inspector when the popup looses focus (case 1258571)
- Light quality setting for contact shadow set to on for High quality by default.
- Fixed an exception thrown when closing the look dev because there is no active SRP anymore.
- Fixed alignment of framesettings in HDRP Default Settings

### Changed
- Preparation pass for RTSSShadows to be supported by render graph.
Expand Down