diff options
| author | Vsevolod Kukol <sevoku@microsoft.com> | 2018-03-16 20:09:34 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2018-08-08 22:28:03 +0300 |
| commit | 4b41a8979013d54667bee77b76b08a77bf924f73 (patch) | |
| tree | 960ae9be5d6d8e9ee61241fbf618c495962f55ca | |
| parent | 4d3d60f5f1dc8cf5c896164c41c6e048bf42e710 (diff) | |
[BuildOutput] Default to native backend on Macstructured-build-output-gtk-alt-in-debug
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputViewContent.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputViewContent.cs index f05adcbea5..acd057ded7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputViewContent.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.BuildOutputView/BuildOutputViewContent.cs @@ -73,10 +73,14 @@ namespace MonoDevelop.Ide.BuildOutputView if (control != null) return control; var toolbar = WorkbenchWindow.GetToolbar (this); - // TODO: enable native backend by default without checking NATIVE_BUILD_OUTPUT env - var nativeEnabled = Environment.GetEnvironmentVariable ("NATIVE_BUILD_OUTPUT")?.ToLower () == "true"; + + var forceGtk = false; // native mode on Mac only, until we support Wpf embedding - var engine = Xwt.Toolkit.NativeEngine.Type == ToolkitType.XamMac && nativeEnabled ? Xwt.Toolkit.NativeEngine : Xwt.Toolkit.CurrentEngine; + #if DEBUG + // allow to load the Gtk backend, if the Alt key is pressed in DEBUG mode + forceGtk = GtkWorkarounds.GetCurrentKeyModifiers ().HasFlag (Gdk.ModifierType.Mod1Mask); + #endif + var engine = Xwt.Toolkit.NativeEngine.Type == ToolkitType.XamMac && !forceGtk ? Xwt.Toolkit.NativeEngine : Xwt.Toolkit.CurrentEngine; engine.Invoke (() => { if (buildOutput != null) control = new BuildOutputWidget (buildOutput, ContentName, toolbar); |