diff options
author | Vsevolod Kukol <sevoku@microsoft.com> | 2019-11-11 20:19:14 +0300 |
---|---|---|
committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-11-12 16:17:09 +0300 |
commit | 22b1f06371676c82d481d27278fad0f131cd8400 (patch) | |
tree | 357e2c9b5981083ab0917a124db119a202c567f2 /main | |
parent | c2d72bd296745847f794cdd03d4fe4ebd2f91e88 (diff) |
[Mac][NuGet] Use Components.SearchEntry for the Xwt.SearchEntry backend
Xwt.GtkBackend.SearchEntry is a copy of Components.SearchEntry,
but without accessibility features on macOS. Since we use that widget
in PackageManagement only anway, let's just use the original widget
that is accessible. We can review this once we get an updated
SearchWidget backend in Xwt.Gtk.
Fixes VSTS #750371
Diffstat (limited to 'main')
4 files changed, 72 insertions, 0 deletions
diff --git a/main/src/addins/MacPlatform/AccessibleGtkSearchEntryBackend.cs b/main/src/addins/MacPlatform/AccessibleGtkSearchEntryBackend.cs new file mode 100644 index 0000000000..02d09e7b82 --- /dev/null +++ b/main/src/addins/MacPlatform/AccessibleGtkSearchEntryBackend.cs @@ -0,0 +1,68 @@ +// +// AccessibleGtkSearchEntryBackend.cs +// +// Author: +// Vsevolod Kukol <sevoku@microsoft.com> +// +// Copyright (c) 2019 +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +using System; +using MonoDevelop.Components; +using Xwt.Backends; +using Xwt.GtkBackend; + +namespace MacPlatform +{ + public class AccessibleGtkSearchEntryBackend : TextEntryBackend, ISearchTextEntryBackend + { + SearchEntry searchEntry; + + protected override Gtk.Entry TextEntry { + get { + return searchEntry.Entry; + } + } + + public override void Initialize () + { + searchEntry = new SearchEntry (); + searchEntry.ForceFilterButtonVisible = true; + searchEntry.RoundedShape = true; + searchEntry.HasFrame = true; + ((WidgetBackend)this).Widget = searchEntry; + searchEntry.Show (); + } + + public override void SetFocus () + { + base.SetFocus (); + TextEntry.GrabFocus (); + } + + public override bool ShowFrame { + get { + return searchEntry.HasFrame; + } + set { + searchEntry.HasFrame = value; + } + } + } +} diff --git a/main/src/addins/MacPlatform/MacPlatform.cs b/main/src/addins/MacPlatform/MacPlatform.cs index 3916678154..edfec54a46 100644 --- a/main/src/addins/MacPlatform/MacPlatform.cs +++ b/main/src/addins/MacPlatform/MacPlatform.cs @@ -161,6 +161,8 @@ namespace MonoDevelop.MacIntegration Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarWindowBackend,ExtendedTitleBarWindowBackend> (); Xwt.Toolkit.CurrentEngine.RegisterBackend<IExtendedTitleBarDialogBackend,ExtendedTitleBarDialogBackend> (); + Xwt.Toolkit.CurrentEngine.RegisterBackend<Xwt.Backends.ISearchTextEntryBackend,AccessibleGtkSearchEntryBackend> (); + var description = XamMacBuildInfo.Value; if (string.IsNullOrEmpty (description)) { diff --git a/main/src/addins/MacPlatform/MacPlatform.csproj b/main/src/addins/MacPlatform/MacPlatform.csproj index 7f051bd92d..4fffdab94f 100644 --- a/main/src/addins/MacPlatform/MacPlatform.csproj +++ b/main/src/addins/MacPlatform/MacPlatform.csproj @@ -93,6 +93,7 @@ <Compile Include="MacProxyCredentialProvider.cs" /> <Compile Include="ExtendedTitleBarWindowBackend.cs" /> <Compile Include="ExtendedTitleBarDialogBackend.cs" /> + <Compile Include="AccessibleGtkSearchEntryBackend.cs" /> <Compile Include="MainToolbar\MainToolbar.cs" /> <Compile Include="MainToolbar\RunButton.cs" /> <Compile Include="MainToolbar\SearchBar.cs" /> diff --git a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.UI.cs b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.UI.cs index 56a610a238..08f0404871 100644 --- a/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.UI.cs +++ b/main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.Gui/ManagePackagesDialog.UI.cs @@ -137,6 +137,7 @@ namespace MonoDevelop.PackageManagement packageSearchEntry = new SearchTextEntry (); packageSearchEntry.Name = "managePackagesDialogSearchEntry"; packageSearchEntry.WidthRequest = 187; + packageSearchEntry.Accessible.Label = GettextCatalog.GetString ("Package Search"); topHBox.PackEnd (packageSearchEntry); this.HeaderContent = topHBox; |