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

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source 
# Conflicts:
#	Source/Tools/Flax.Build/Build/Builder.Projects.cs
#	Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
This commit is contained in:
Wojtek Figat
2023-03-14 11:52:41 +01:00
parent b7a3b10498 1c27674fd5
commit 74758f5380
25 changed files with 545 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Editor/Windows/ContentWindow.cs
View File

@@ -326,10 +326,10 @@ namespace FlaxEditor.Windows
Select(item, true);
// Disable scrolling in content view
if (_split.Panel2.VScrollBar != null)
_split.Panel2.VScrollBar.ThumbEnabled = false;
if (_split.Panel2.HScrollBar != null)
_split.Panel2.HScrollBar.ThumbEnabled = false;
if (_contentViewPanel.VScrollBar != null)
_contentViewPanel.VScrollBar.ThumbEnabled = false;
if (_contentViewPanel.HScrollBar != null)
_contentViewPanel.HScrollBar.ThumbEnabled = false;
ScrollingOnContentView(false);
// Show rename popup
@@ -340,10 +340,10 @@ namespace FlaxEditor.Windows
popup.Closed += renamePopup =>
{
// Restore scrolling in content view
if (_split.Panel2.VScrollBar != null)
_split.Panel2.VScrollBar.ThumbEnabled = true;
if (_split.Panel2.HScrollBar != null)
_split.Panel2.HScrollBar.ThumbEnabled = true;
if (_contentViewPanel.VScrollBar != null)
_contentViewPanel.VScrollBar.ThumbEnabled = true;
if (_contentViewPanel.HScrollBar != null)
_contentViewPanel.HScrollBar.ThumbEnabled = true;
ScrollingOnContentView(true);
// Check if was creating new element
@@ -761,7 +761,7 @@ namespace FlaxEditor.Windows
// Select and scroll to cover in view
_view.Select(item);
_split.Panel2.ScrollViewTo(item, fastScroll);
_contentViewPanel.ScrollViewTo(item, fastScroll);
// Focus
_view.Focus();