This commit is contained in:
2026-06-16 18:12:42 +07:00
parent 1889f1e032
commit f23f8ce89f
14 changed files with 46 additions and 22 deletions

View File

@@ -119,7 +119,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1}
- _Color: {r: 0.117646985, g: 0.117646985, b: 0.117646985, a: 1}
- _Color: {r: 0.11764703, g: 0.11764703, b: 0.11764703, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1}
- _Color: {r: 0.18101203, g: 0.61652833, b: 0.7941176, a: 1}
- _Color: {r: 0.18101206, g: 0.61652833, b: 0.7941176, a: 1}
- _EmissionColor: {r: 0.05693069, g: 0.1943069, b: 0.25, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -133,7 +133,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
- _Color: {r: 0, g: 0.26590905, b: 0.5735295, a: 1}
- _Color: {r: 0, g: 0.26590908, b: 0.5735295, a: 1}
- _EmissionColor: {r: 0.585611, g: 1.1171656, b: 1.7207954, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -120,7 +120,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1}
- _Color: {r: 0.08490565, g: 0.08490565, b: 0.08490565, a: 1}
- _Color: {r: 0.08490568, g: 0.08490568, b: 0.08490568, a: 1}
- _EmissionColor: {r: 0.63061863, g: 0.94044524, b: 1.6181911, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -133,7 +133,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0, g: 1, b: 0.090196066, a: 0.36078432}
- _Color: {r: 0, g: 1, b: 0.09019602, a: 0.36078432}
- _Color: {r: 0, g: 1, b: 0.090196066, a: 0.36078432}
- _EmissionColor: {r: 0, g: 1, b: 0.09019608, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -125,7 +125,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 1, b: 0.089654915, a: 0.359}
- _Color: {r: 0, g: 1, b: 0.089654885, a: 0.359}
- _Color: {r: 0, g: 1, b: 0.089654915, a: 0.359}
- _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -133,7 +133,7 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432}
- _Color: {r: 1, g: 0.17647052, b: 0.17647052, a: 0.36078432}
- _Color: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.36078432}
- _EmissionColor: {r: 1, g: 0.1764706, b: 0.1764706, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -125,7 +125,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359}
- _Color: {r: 1, g: 0.17647052, b: 0.17647052, a: 0.359}
- _Color: {r: 1, g: 0.17647055, b: 0.17647055, a: 0.359}
- _EmissionColor: {r: 0.315, g: 0.315, b: 0.315, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -309,8 +309,7 @@ namespace VFavorites
}
void crossButton()
{
if (!rowRect.IsHovered()) return;
if (draggingItem) return;
if (!rowRect.IsHovered()) return; if (draggingItem) return;
// if (mousePresesdOnItem) return; // idk
var buttonRect = rowRect.SetWidthFromRight(0).MoveX(-crossButtonOffsetFromRight).SetWidthFromMid(crossButtonSize);
@@ -883,7 +882,8 @@ namespace VFavorites
if (isWrappedBrowserLocked)
if (!totalRect_browserSpace.IsHovered() && !animatingDroppedItem && !animatingPageScroll) return;
if (EditorApplication.timeSinceStartup - lastLockToggleTime > 1)
if (!wrappedBrowser.position.SetPos(0, 0).IsHovered() && !animatingDroppedItem && !animatingPageScroll) return;
wrappedBrowser.Repaint();
@@ -1845,6 +1845,11 @@ namespace VFavorites
EditorPrefs.SetInt("vFavorites-lockedBrowserHash", lockedBrowser.GetHashCode());
EditorPrefs.SetInt("vFavorites-lockedBrowserDockAreaInstanceId", lockedBrowser.GetMemberValue<Object>("m_Parent").GetInstanceID());
lastLockToggleTime = EditorApplication.timeSinceStartup;
wrappedBrowser.Repaint();
allBrowsers.ForEach(r => r.Repaint());
curEvent.Use();
}
@@ -1853,12 +1858,18 @@ namespace VFavorites
if (!lockedBrowser) return;
if (lockedBrowser.GetMemberValue<bool>("isLocked")) return;
var b = lockedBrowser;
lockedBrowser = null;
EditorPrefs.SetInt("vFavorites-lockedBrowserHash", 0);
EditorPrefs.SetInt("vFavorites-lockedBrowserDockAreaInstanceId", 0);
lastLockToggleTime = EditorApplication.timeSinceStartup;
if (b) b.Repaint();
allBrowsers.ForEach(r => r.Repaint());
curEvent.Use();
}
@@ -1954,6 +1965,7 @@ namespace VFavorites
static bool CanBrowserBeWrapped_byVTabs(EditorWindow browser) => !IsMarkedAsLocked(browser);
static double lastLockToggleTime;

View File

@@ -927,11 +927,13 @@ namespace VTabs
if (isWrapped)
RestoreDefaultBrowserGUI(browser);
/*
if (browser.GetPropertyValue<bool>("isLocked", exceptionIfNotFound: false))
{
browser.SetPropertyValue("isLocked", false, exceptionIfNotFound: false);
UpdateBrowserTitle(browser);
}
*/
return;
}