Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 04:22:20 +02:00
Code Activity

Fixed focus issue with popup error

Browse source
This commit is contained in:
Brian Fiete 2020-09-04 08:58:29 -07:00
parent 25f44ae133
commit 7400e7099c
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
IDE/src/IDEApp.bf
View file

@ -4465,8 +4465,26 @@ namespace IDE
ShowTab(panel, label, false, setFocus); ShowTab(panel, label, false, setFocus);
if (setFocus) if (setFocus)
panel.FocusForKeyboard(); panel.FocusForKeyboard();
if ((!panel.mWidgetWindow.mHasFocus) && (!mRunningTestScript)) if ((!panel.mWidgetWindow.mHasFocus) && (!mRunningTestScript))
panel.mWidgetWindow.SetForeground(); {
bool hasFocus = false;
BFWindow activeWindow = GetActiveWindow(true);
BFWindow checkWindow = activeWindow;
while (checkWindow != null)
{
if (checkWindow == panel.mWidgetWindow)
{
activeWindow.SetForeground();
hasFocus = true;
break;
}
checkWindow = checkWindow.mParent;
}
if (!hasFocus)
panel.mWidgetWindow.SetForeground();
}
#endif #endif
} }
@ -5480,13 +5498,13 @@ namespace IDE
return null; return null;
} }
public WidgetWindow GetActiveWindow() public WidgetWindow GetActiveWindow(bool allowModal = false)
{ {
for (let window in mWindows) for (let window in mWindows)
if (window.mHasFocus) if (window.mHasFocus)
{ {
var result = window; var result = window;
while ((result.mWindowFlags.HasFlag(.Modal)) && (result.mParent != null)) while ((result.mWindowFlags.HasFlag(.Modal)) && (result.mParent != null) && (!allowModal))
result = result.mParent; result = result.mParent;
return result as WidgetWindow; return result as WidgetWindow;
} }