Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/xwt.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVsevolod Kukol <sevo@xamarin.com>2016-03-04 11:38:48 +0300
committerVsevolod Kukol <sevo@xamarin.com>2016-03-04 11:38:48 +0300
commita3af5e51e5f0c4da65c6b8ac1d0bfa2f8b8e86a1 (patch)
tree6b47ca50074c9ad4dcd48dfa1ada60c9e45e897c /Xwt.XamMac/Xwt.Mac/TextEntryBackend.cs
parent99fde98a93d0442d73979ee1795f9299891a9496 (diff)
[Mac] Fix TextEntry mouse event handling
reverts CustomAlignedContainer removal in 493ac40da5ccd1cd4e790c92d5b0247b75d2d8e5
Diffstat (limited to 'Xwt.XamMac/Xwt.Mac/TextEntryBackend.cs')
-rw-r--r--Xwt.XamMac/Xwt.Mac/TextEntryBackend.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/Xwt.XamMac/Xwt.Mac/TextEntryBackend.cs b/Xwt.XamMac/Xwt.Mac/TextEntryBackend.cs
index d2f41784..90fbe6fe 100644
--- a/Xwt.XamMac/Xwt.Mac/TextEntryBackend.cs
+++ b/Xwt.XamMac/Xwt.Mac/TextEntryBackend.cs
@@ -62,7 +62,8 @@ namespace Xwt.Mac
((MacComboBox)ViewObject).SetEntryEventSink (EventSink);
} else {
var view = new CustomTextField (EventSink, ApplicationContext);
- ViewObject = view;
+ ViewObject = new CustomAlignedContainer (EventSink, ApplicationContext, (NSView)view) { DrawsBackground = false };
+ Container.ExpandVertically = true;
MultiLine = false;
}
Widget.StringValue = string.Empty;
@@ -83,11 +84,15 @@ namespace Xwt.Mac
protected override void OnSizeToFit ()
{
- Widget.SizeToFit ();
+ Container.SizeToFit ();
+ }
+
+ CustomAlignedContainer Container {
+ get { return base.Widget as CustomAlignedContainer; }
}
public new NSTextField Widget {
- get { return (NSTextField)ViewObject; }
+ get { return (ViewObject is MacComboBox) ? (NSTextField)ViewObject : (NSTextField) Container.Child; }
}
protected override Size GetNaturalSize ()