Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-29 16:00:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix hit detection for selected panes.

Browse source 
If a pane is already selected, if mouse picked it will not delect allowing to be moved.
If pane is not visible (but is in editor) a proper pane outline will be drawn for editor purposes.
This commit is contained in:
KillzXGaming 2019-10-09 17:39:54 -04:00
parent 96dbc7c83e
commit 833565f21b
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
File_Format_Library/GUI/BFLYT/LayoutViewer.cs
View file

@ -54,6 +54,10 @@ namespace LayoutBXLYT
UpdateViewport(); UpdateViewport();
} }
public Dictionary<string, STGenericTexture> GetTextures() {
return Textures;
}
public GLControl GetGLControl() => glControl1; public GLControl GetGLControl() => glControl1;
public LayoutViewer(LayoutEditor editor, BxlytHeader bxlyt, Dictionary<string, STGenericTexture> textures) public LayoutViewer(LayoutEditor editor, BxlytHeader bxlyt, Dictionary<string, STGenericTexture> textures)
@ -307,7 +311,6 @@ namespace LayoutBXLYT
} }
private bool test = true;
private void RenderPanes(BxlytShader shader, BasePane pane, bool isRoot, byte parentAlpha, bool parentAlphaInfluence, BasePane partPane = null, int stage = 0) private void RenderPanes(BxlytShader shader, BasePane pane, bool isRoot, byte parentAlpha, bool parentAlphaInfluence, BasePane partPane = null, int stage = 0)
{ {
if (!pane.DisplayInEditor || !pane.animController.Visibile) if (!pane.DisplayInEditor || !pane.animController.Visibile)
@ -386,7 +389,9 @@ namespace LayoutBXLYT
{ {
bool isSelected = SelectedPanes.Contains(pane); bool isSelected = SelectedPanes.Contains(pane);
if (pane is IPicturePane) if (!pane.Visible)
DrawDefaultPane(shader, pane, isSelected);
else if (pane is IPicturePane)
BxlytToGL.DrawPictureBox(pane, GameWindow, effectiveAlpha, Textures, isSelected); BxlytToGL.DrawPictureBox(pane, GameWindow, effectiveAlpha, Textures, isSelected);
else if (pane is IWindowPane) else if (pane is IWindowPane)
BxlytToGL.DrawWindowPane(pane, GameWindow, effectiveAlpha, Textures, isSelected); BxlytToGL.DrawWindowPane(pane, GameWindow, effectiveAlpha, Textures, isSelected);
@ -402,9 +407,7 @@ namespace LayoutBXLYT
foreach (var fontFile in FirstPlugin.PluginRuntime.BxfntFiles) foreach (var fontFile in FirstPlugin.PluginRuntime.BxfntFiles)
{ {
if (Utils.CompareNoExtension(fontFile.Name, textPane.FontName)) if (Utils.CompareNoExtension(fontFile.Name, textPane.FontName))
{
bitmap = fontFile.GetBitmap(textPane.Text, false, pane); bitmap = fontFile.GetBitmap(textPane.Text, false, pane);
}
} }
} }
@ -832,7 +835,7 @@ namespace LayoutBXLYT
private void SearchHit(BasePane pane, int X, int Y, ref BasePane SelectedPane) private void SearchHit(BasePane pane, int X, int Y, ref BasePane SelectedPane)
{ {
bool isVisible = pane.Visible; bool isVisible = true;
if (!Runtime.LayoutEditor.DisplayPicturePane && pane is IPicturePane) if (!Runtime.LayoutEditor.DisplayPicturePane && pane is IPicturePane)
isVisible = false; isVisible = false;
if (!Runtime.LayoutEditor.DisplayWindowPane && pane is IWindowPane) if (!Runtime.LayoutEditor.DisplayWindowPane && pane is IWindowPane)
@ -846,10 +849,14 @@ namespace LayoutBXLYT
if (isVisible && pane.DisplayInEditor && pane.IsHit(X, Y) && !pane.IsRoot) if (isVisible && pane.DisplayInEditor && pane.IsHit(X, Y) && !pane.IsRoot)
{ {
SelectedPane = pane; //Select the first possible pane
return; //If the pane is selected already, pick that instead
//This is useful if the selected pane wants to be moved already
if (SelectedPane == null || SelectedPanes.Contains(pane))
SelectedPane = pane;
} }
//Keep searching even if we found our pane so we can find any that's selected
foreach (var childPane in pane.Childern) foreach (var childPane in pane.Childern)
SearchHit(childPane, X, Y, ref SelectedPane); SearchHit(childPane, X, Y, ref SelectedPane);
} }