Merge remote-tracking branch 'origin/1.1' into linux-editor
# Conflicts: # Source/FlaxEngine.Gen.cs # Source/Tools/Flax.Build/Utilities/Utilities.cs
This commit is contained in:
@@ -348,7 +348,7 @@ static int X11_MessageBoxCreateWindow(MessageBoxData* data)
|
||||
{
|
||||
windowdata = data->Parent;
|
||||
windowdataWin = (X11::Window)windowdata->GetNativePtr();
|
||||
// TODO: place popup on the the screen that parent window is
|
||||
// TODO: place popup on the screen that parent window is
|
||||
data->screen = X11_DefaultScreen(display);
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user