diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2015-06-01 15:18:50 +0300 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2015-06-01 15:18:50 +0300 |
| commit | d82e74a8e47780ec4731799483d872f8a6e26083 (patch) | |
| tree | 4fbd626422813843cc69e08f484699b655b0d4d3 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop | |
| parent | a556244492effa4631e8d49f4086c14a536bb94e (diff) | |
| parent | 82e8055ed3911bcab828dd93b6f1848f53e72239 (diff) | |
Merge branch 'master' into roslyn
Conflicts:
main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseGitRepositoryTests.cs
main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/BaseRepositoryTests.cs
version-checks
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs index 23596e3f48..2e66e750f7 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Desktop/PlatformService.cs @@ -434,7 +434,13 @@ namespace MonoDevelop.Ide.Desktop /// </summary> public virtual void GrabDesktopFocus (Gtk.Window window) { - window.Present (); + if (Platform.IsWindows && window.IsRealized) { + /* On Windows calling Present() will break out of window edge snapping mode. */ + window.GdkWindow.Focus (0); + window.GdkWindow.Raise (); + } else { + window.Present (); + } } internal virtual void RemoveWindowShadow (Gtk.Window window) |