diff --git a/Source/Editor/EditorIcons.cs b/Source/Editor/EditorIcons.cs index ff3164dcc..da92a159f 100644 --- a/Source/Editor/EditorIcons.cs +++ b/Source/Editor/EditorIcons.cs @@ -46,7 +46,9 @@ namespace FlaxEditor public SpriteHandle Down32; public SpriteHandle FolderClosed32; public SpriteHandle FolderOpen32; - public SpriteHandle FolderFill32; + public SpriteHandle Folder32; + public SpriteHandle CameraFill32; + public SpriteHandle Search32; public SpriteHandle Info32; public SpriteHandle Warning32; public SpriteHandle Error32; diff --git a/Source/Editor/GUI/Timeline/Tracks/ActorTrack.cs b/Source/Editor/GUI/Timeline/Tracks/ActorTrack.cs index 580d1f266..fc096ca56 100644 --- a/Source/Editor/GUI/Timeline/Tracks/ActorTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/ActorTrack.cs @@ -70,7 +70,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks : base(ref options) { // Select Actor button - const float buttonSize = 14; + const float buttonSize = 20; var icons = Editor.Instance.Icons; _selectActor = new Image { @@ -80,7 +80,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks IsScrollable = false, Color = Style.Current.ForegroundGrey, Margin = new Margin(1), - Brush = new SpriteBrush(icons.Search12), + Brush = new SpriteBrush(icons.Search32), Offsets = new Margin(-buttonSize - 2 + _addButton.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize), Parent = this, }; diff --git a/Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs b/Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs index 98cb3979f..1df00c1b0 100644 --- a/Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs @@ -312,7 +312,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks Curve.UnlockChildrenRecursive(); // Navigation buttons - const float buttonSize = 14; + const float buttonSize = 20; var icons = Editor.Instance.Icons; var rightKey = new Image { diff --git a/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs b/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs index 359fa0126..f6f80ab22 100644 --- a/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/CameraCutTrack.cs @@ -682,10 +682,10 @@ namespace FlaxEditor.GUI.Timeline.Tracks public CameraCutTrack(ref TrackCreateOptions options) : base(ref options) { - Height = CameraCutThumbnailRenderer.Height + 4 + 4; + Height = CameraCutThumbnailRenderer.Height + 8; // Pilot Camera button - const float buttonSize = 14; + const float buttonSize = 20; var icons = Editor.Instance.Icons; _pilotCamera = new Image { @@ -695,7 +695,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks IsScrollable = false, Color = Style.Current.ForegroundGrey, Margin = new Margin(1), - Brush = new SpriteBrush(icons.Camera64), + Brush = new SpriteBrush(icons.CameraFill32), Offsets = new Margin(-buttonSize - 2 + _selectActor.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize), Parent = this, }; diff --git a/Source/Editor/GUI/Timeline/Tracks/FolderTrack.cs b/Source/Editor/GUI/Timeline/Tracks/FolderTrack.cs index 5e251b6d2..c01719b97 100644 --- a/Source/Editor/GUI/Timeline/Tracks/FolderTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/FolderTrack.cs @@ -24,7 +24,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks { TypeId = 1, Name = "Folder", - Icon = Editor.Instance.Icons.Folder64, + Icon = Editor.Instance.Icons.Folder32, Create = options => new FolderTrack(ref options), Load = LoadTrack, Save = SaveTrack, diff --git a/Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs b/Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs index 302570fae..d6fa64a98 100644 --- a/Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs +++ b/Source/Editor/GUI/Timeline/Tracks/MemberTrack.cs @@ -118,7 +118,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks if (useNavigationButtons) { // Navigation buttons - const float buttonSize = 14; + const float buttonSize = 20; var icons = Editor.Instance.Icons; _rightKey = new Image { @@ -128,7 +128,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks IsScrollable = false, Color = Style.Current.ForegroundGrey, Margin = new Margin(1), - Brush = new SpriteBrush(icons.Right64), + Brush = new SpriteBrush(icons.Right32), Offsets = new Margin(-buttonSize - 2 + uiLeft, buttonSize, buttonSize * -0.5f, buttonSize), Parent = this, }; @@ -138,9 +138,9 @@ namespace FlaxEditor.GUI.Timeline.Tracks AutoFocus = true, AnchorPreset = AnchorPresets.MiddleRight, IsScrollable = false, - Color = Style.Current.Foreground, + Color = Style.Current.ForegroundGrey, Margin = new Margin(3), - Brush = new SpriteBrush(icons.Add64), + Brush = new SpriteBrush(icons.Add32), Offsets = new Margin(-buttonSize - 2 + _rightKey.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize), Parent = this, }; @@ -150,9 +150,9 @@ namespace FlaxEditor.GUI.Timeline.Tracks AutoFocus = true, AnchorPreset = AnchorPresets.MiddleRight, IsScrollable = false, - Color = Style.Current.Foreground, + Color = Style.Current.ForegroundGrey, Margin = new Margin(1), - Brush = new SpriteBrush(icons.Left64), + Brush = new SpriteBrush(icons.Left32), Offsets = new Margin(-buttonSize - 2 + _addKey.Offsets.Left, buttonSize, buttonSize * -0.5f, buttonSize), Parent = this, }; diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs index 88a976d2b..8a4db3789 100644 --- a/Source/Editor/Windows/ContentWindow.cs +++ b/Source/Editor/Windows/ContentWindow.cs @@ -66,7 +66,7 @@ namespace FlaxEditor.Windows : base(editor, true, ScrollBars.None) { Title = "Content"; - Icon = editor.Icons.Folder64; + Icon = editor.Icons.Folder32; // Content database events editor.ContentDatabase.WorkspaceModified += () => _isWorkspaceDirty = true;