GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Move member track preview value showing to be shared impl

Browse Source
This commit is contained in:
Wojtek Figat
2021-07-30 15:57:51 +02:00
parent e1cac0b779
commit 16c656cda2
5 changed files with 24 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Editor/GUI/Timeline/Track.cs
View File

@@ -896,13 +896,12 @@ namespace FlaxEditor.GUI.Timeline
var left = _xOffset + 16; // offset + arrow
var height = HeaderHeight;
var bounds = new Rectangle(Vector2.Zero, Size);
var textRect = new Rectangle(left, 0, Width - left, height);
var textRect = new Rectangle(left, 0, bounds.Width - left, height);
_margin.ShrinkRectangle(ref textRect);
var textColor = style.Foreground * TitleTintColor;
var backgroundColorSelected = style.BackgroundSelected;
var backgroundColorHighlighted = style.BackgroundHighlighted;
var backgroundColorSelectedUnfocused = style.LightBackground;
var textFont = new FontReference(style.FontSmall);
var isMouseOver = IsMouseOver;
// Draw background
@@ -926,7 +925,7 @@ namespace FlaxEditor.GUI.Timeline
}
// Draw text
Render2D.DrawText(textFont.GetFont(), Title ?? Name, textRect, textColor, TextAlignment.Near, TextAlignment.Center);
Render2D.DrawText(style.FontSmall, Title ?? Name, textRect, textColor, TextAlignment.Near, TextAlignment.Center);
// Disabled overlay
DrawDisabled = Mute || (ParentTrack != null && ParentTrack.DrawDisabled);

16
Source/Editor/GUI/Timeline/Tracks/CurvePropertyTrack.cs
View File

@@ -266,19 +266,8 @@ namespace FlaxEditor.GUI.Timeline.Tracks
/// <inheritdoc />
public override void OnTimelineChanged(Timeline timeline)
{
if (Timeline != null)
{
Timeline.ShowPreviewValuesChanged -= OnTimelineShowPreviewValuesChanged;
}
base.OnTimelineChanged(timeline);
if (Timeline != null)
{
_previewValue.Visible = Timeline.ShowPreviewValues;
Timeline.ShowPreviewValuesChanged += OnTimelineShowPreviewValuesChanged;
}
if (Curve != null)
{
Curve.Parent = timeline?.MediaPanel;
@@ -296,11 +285,6 @@ namespace FlaxEditor.GUI.Timeline.Tracks
UpdatePreviewValue();
}
private void OnTimelineShowPreviewValuesChanged()
{
_previewValue.Visible = Timeline.ShowPreviewValues;
}
/// <inheritdoc />
public override void OnTimelineZoomChanged()
{

18
Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
View File

@@ -361,32 +361,14 @@ namespace FlaxEditor.GUI.Timeline.Tracks
/// <inheritdoc />
public override void OnTimelineChanged(Timeline timeline)
{
if (Timeline != null)
{
Timeline.ShowPreviewValuesChanged -= OnTimelineShowPreviewValuesChanged;
}
base.OnTimelineChanged(timeline);
if (Timeline != null)
{
if (_previewValue != null)
_previewValue.Visible = Timeline.ShowPreviewValues;
Timeline.ShowPreviewValuesChanged += OnTimelineShowPreviewValuesChanged;
}
Events.Parent = timeline?.MediaPanel;
Events.FPS = timeline?.FramesPerSecond;
UpdateEvents();
}
private void OnTimelineShowPreviewValuesChanged()
{
if (_previewValue != null)
_previewValue.Visible = Timeline.ShowPreviewValues;
}
/// <inheritdoc />
public override void OnTimelineZoomChanged()
{

16
Source/Editor/GUI/Timeline/Tracks/KeyframesPropertyTrack.cs
View File

@@ -325,19 +325,8 @@ namespace FlaxEditor.GUI.Timeline.Tracks
/// <inheritdoc />
public override void OnTimelineChanged(Timeline timeline)
{
if (Timeline != null)
{
Timeline.ShowPreviewValuesChanged -= OnTimelineShowPreviewValuesChanged;
}
base.OnTimelineChanged(timeline);
if (Timeline != null)
{
_previewValue.Visible = Timeline.ShowPreviewValues;
Timeline.ShowPreviewValuesChanged += OnTimelineShowPreviewValuesChanged;
}
Keyframes.Parent = timeline?.MediaPanel;
Keyframes.FPS = timeline?.FramesPerSecond;
@@ -353,11 +342,6 @@ namespace FlaxEditor.GUI.Timeline.Tracks
UpdatePreviewValue();
}
private void OnTimelineShowPreviewValuesChanged()
{
_previewValue.Visible = Timeline.ShowPreviewValues;
}
/// <inheritdoc />
public override void OnTimelineZoomChanged()
{

22
Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs
View File

@@ -293,6 +293,28 @@ namespace FlaxEditor.GUI.Timeline.Tracks
{
}
/// <inheritdoc />
public override void OnTimelineChanged(Timeline timeline)
{
if (Timeline != null && _previewValue != null)
{
Timeline.ShowPreviewValuesChanged -= OnTimelineShowPreviewValuesChanged;
}
base.OnTimelineChanged(timeline);
if (Timeline != null && _previewValue != null)
{
_previewValue.Visible = Timeline.ShowPreviewValues;
Timeline.ShowPreviewValuesChanged += OnTimelineShowPreviewValuesChanged;
}
}
private void OnTimelineShowPreviewValuesChanged()
{
_previewValue.Visible = Timeline.ShowPreviewValues;
}
/// <inheritdoc />
public override void Update(float deltaTime)
{