diff options
author | Vsevolod Kukol <sevoku@microsoft.com> | 2017-03-08 12:51:49 +0300 |
---|---|---|
committer | Vsevolod Kukol <sevoku@microsoft.com> | 2017-03-09 13:31:53 +0300 |
commit | ff7a9c3f40597655f480310a22492d994ade5d23 (patch) | |
tree | 41b3511fbe0ece1b45cd3d4f2c09b176e663e045 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor | |
parent | 6cdec619f7e11d3c1b35a139849c1d4bc61e610a (diff) |
[Ide] TooltipProvider tooltips are Windows
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor')
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedTooltipProvider.cs | 8 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedTooltipProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedTooltipProvider.cs index 322f33f984..ed61bb40b1 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedTooltipProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/Projection/ProjectedTooltipProvider.cs @@ -59,22 +59,22 @@ namespace MonoDevelop.Ide.Editor.Projection return null; } - public override bool IsInteractive (TextEditor editor, Control tipWindow) + public override bool IsInteractive (TextEditor editor, Window tipWindow) { return projectedTooltipProvider.IsInteractive (editor, tipWindow); } - public override void ShowTooltipWindow (TextEditor editor, Control tipWindow, TooltipItem item, Xwt.ModifierKeys modifierState, int mouseX, int mouseY) + public override void ShowTooltipWindow (TextEditor editor, Window tipWindow, TooltipItem item, Xwt.ModifierKeys modifierState, int mouseX, int mouseY) { projectedTooltipProvider.ShowTooltipWindow (editor, tipWindow, item, modifierState, mouseX, mouseY); } - public override void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign) + public override void GetRequiredPosition (TextEditor editor, Window tipWindow, out int requiredWidth, out double xalign) { projectedTooltipProvider.GetRequiredPosition (editor, tipWindow, out requiredWidth, out xalign); } - public override Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Xwt.ModifierKeys modifierState) + public override Window CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Xwt.ModifierKeys modifierState) { foreach (var pseg in projection.ProjectedSegments) { if (pseg.ContainsOriginal (offset)) { diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs index 259bad2056..85f608d7d3 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TooltipProvider.cs @@ -89,18 +89,18 @@ namespace MonoDevelop.Ide.Editor { public abstract Task<TooltipItem> GetItem (TextEditor editor, DocumentContext ctx, int offset, CancellationToken token = default(CancellationToken)); - public virtual bool IsInteractive (TextEditor editor, Control tipWindow) + public virtual bool IsInteractive (TextEditor editor, Window tipWindow) { return false; } - public virtual void GetRequiredPosition (TextEditor editor, Control tipWindow, out int requiredWidth, out double xalign) + public virtual void GetRequiredPosition (TextEditor editor, Window tipWindow, out int requiredWidth, out double xalign) { - requiredWidth = ((Gtk.Widget)tipWindow).SizeRequest ().Width; + requiredWidth = ((Gtk.Window)tipWindow).SizeRequest ().Width; xalign = 0.5; } - public virtual Control CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Xwt.ModifierKeys modifierState) + public virtual Window CreateTooltipWindow (TextEditor editor, DocumentContext ctx, TooltipItem item, int offset, Xwt.ModifierKeys modifierState) { return null; } @@ -131,12 +131,12 @@ namespace MonoDevelop.Ide.Editor tipWindow.ShowPopup (editorWidget, caret, PopupPosition.Top); } - public virtual void ShowTooltipWindow (TextEditor editor, Control tipWindow, TooltipItem item, Xwt.ModifierKeys modifierState, int mouseX, int mouseY) + public virtual void ShowTooltipWindow (TextEditor editor, Window tipWindow, TooltipItem item, Xwt.ModifierKeys modifierState, int mouseX, int mouseY) { if (tipWindow == null) return; - var tipInfoWindow = ((Gtk.Widget)tipWindow) as TooltipInformationWindow; + var tipInfoWindow = ((Gtk.Window)tipWindow) as TooltipInformationWindow; if (tipInfoWindow != null) { ShowTipInfoWindow (editor, tipInfoWindow, item, modifierState, mouseX, mouseY); return; |