Skip to content

Commit

Permalink
Merge pull request #2454 from cwensley/curtis/windows-searchbox
Browse files Browse the repository at this point in the history
Add styling for SearchBox on WinForms and WPF
  • Loading branch information
cwensley committed Mar 27, 2023
2 parents c89cf07 + c7c0e96 commit 2c752dd
Show file tree
Hide file tree
Showing 19 changed files with 720 additions and 144 deletions.
16 changes: 16 additions & 0 deletions src/Eto.WinForms/Eto.WinForms.csproj
Expand Up @@ -16,6 +16,7 @@
<DefineConstants>$(DefineConstants);WINFORMS</DefineConstants>
<NoWarn>MSB4011;$(NoWarn)</NoWarn>
<UseWindowsForms Condition="$(HaveWindowsDesktopSdk) == 'True'">true</UseWindowsForms>
<GenerateResourceUsePreserializedResources>True</GenerateResourceUsePreserializedResources>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -118,9 +119,24 @@ You do not need to use any of the classes of this assembly (unless customizing t
<ItemGroup>
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1020.30" PrivateAssets="all" />
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
</ItemGroup>

<Import Condition="'$(HaveWindowsDesktopSdk)' != 'true'" Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
<Import Condition="'$(HaveWindowsDesktopSdk)' == 'true'" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Project="Sdk.targets" />
<ItemGroup>
<Compile Update="Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

</Project>
106 changes: 103 additions & 3 deletions src/Eto.WinForms/Forms/Controls/SearchBoxHandler.cs 100644 → 100755
@@ -1,10 +1,110 @@
using SD = System.Drawing;
using SWF = System.Windows.Forms;
using sd = System.Drawing;
using swf = System.Windows.Forms;
using Eto.Forms;
using Eto.WinForms.CustomControls;
using System;

namespace Eto.WinForms.Forms.Controls
{
public class SearchBoxHandler : TextBoxHandler, SearchBox.IHandler
public class EtoSearchTextBox : EtoTextBox
{
private readonly swf.PictureBox searchImage;

private readonly swf.Button clearSearchButton;

public EtoSearchTextBox()
{
clearSearchButton = new swf.Button
{
Dock = swf.DockStyle.Right,
Size = new sd.Size(16, 16),
TabStop = false,
FlatStyle = swf.FlatStyle.Flat,
Cursor = swf.Cursors.Arrow,
ImageAlign = sd.ContentAlignment.MiddleCenter,
Image = Resources.Clear
};
clearSearchButton.FlatAppearance.BorderSize = 0;
clearSearchButton.Click += Clear_Click;

searchImage = new swf.PictureBox
{
Dock = swf.DockStyle.Left,
Size = new sd.Size(16, 16),
TabIndex = 0,
SizeMode = swf.PictureBoxSizeMode.CenterImage,
Image = Resources.Search
};


Controls.Add(clearSearchButton);
Controls.Add(searchImage);

UpdateClearButton();
}


protected override void OnResize(EventArgs e)
{
base.OnResize(e);
SetRounded();
}

protected override void OnCreateControl()
{
base.OnCreateControl();
SetRounded();
}

private void SetRounded()
{
Region = sd.Region.FromHrgn(Win32.CreateRoundRectRgn(1, 1, Width, Height, Height * 2 / 3, Height * 2 / 3));
Win32.SendMessage(Handle, Win32.WM.EM_SETMARGINS, (IntPtr)3, (IntPtr)((16 << 16) + 16));
}

private void Clear_Click(object sender, EventArgs e)
{
Text = string.Empty;
Focus();
}

protected override void OnTextChanged(EventArgs e)
{
base.OnTextChanged(e);
UpdateClearButton();
}

private void UpdateClearButton()
{
var showClearButton = !string.IsNullOrEmpty(Text);
if (clearSearchButton.Visible != showClearButton)
{
clearSearchButton.Visible = showClearButton;
}
}

public sd.Image SearchImage
{
set => searchImage.Image = value;
get => searchImage.Image;
}

public sd.Image CancelSearchImage
{
set => clearSearchButton.Image = value;
get => clearSearchButton.Image;
}
}

public class SearchBoxHandler : TextBoxHandler<EtoSearchTextBox, TextBox, TextBox.ICallback>, SearchBox.IHandler
{
public override swf.TextBox SwfTextBox => Control;

public override EtoTextBox EtoTextBox => Control;

public SearchBoxHandler()
{
Control = new EtoSearchTextBox();
}
}
}
83 changes: 83 additions & 0 deletions src/Eto.WinForms/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

127 changes: 127 additions & 0 deletions src/Eto.WinForms/Resources.resx
@@ -0,0 +1,127 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Clear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Clear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added src/Eto.WinForms/Resources/Clear.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Eto.WinForms/Resources/Search.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/Eto.WinForms/Win32.cs 100644 → 100755
Expand Up @@ -182,6 +182,7 @@ public enum WM

ECM_FIRST = 0x1500,
EM_SETCUEBANNER = ECM_FIRST + 1,
EM_SETMARGINS = 0xd3,

DPICHANGED = 0x02E0,
NCCREATE = 0x0081,
Expand Down Expand Up @@ -500,6 +501,10 @@ public static IntPtr GetThreadFocusWindow(uint? threadId = null)
[DllImport("gdi32.dll")]
public static extern bool OffsetWindowOrgEx(IntPtr hdc, int nXOffset, int nYOffset, ref POINT lpPoint);

[DllImport("gdi32.dll")]
public static extern IntPtr CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nheightRect, int nweightRect);


[DllImport("user32.dll")]
public static extern IntPtr WindowFromPoint(POINT lpPoint);

Expand Down

0 comments on commit 2c752dd

Please sign in to comment.