frodovdr/kopano-ol-extension
1
0
Fork 0
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Implemented key forwarding from combo box edit to list

Browse Source
This commit is contained in:
Patrick Simpson 2017-06-28 08:54:51 +02:00
parent 72fa30189e
commit 500499a67e
3 changed files with 65 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KAbstractComboBox.cs
View File

@ -1,4 +1,5 @@
using Acacia.Native;
using Acacia.Utils;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -61,6 +62,12 @@ namespace Acacia.Controls
Controls.Add(_edit);
_state.AddControl(_edit);
_edit.TextChanged += _edit_TextChanged;
_edit.LostFocus += _edit_LostFocus;
}
private void _edit_LostFocus(object sender, EventArgs e)
{
DroppedDown = false;
}
@ -135,7 +142,6 @@ namespace Acacia.Controls
switch ((WM)m.Msg)
{
case WM.KEYDOWN:
System.Diagnostics.Trace.WriteLine("KEYMESSAGE: " + m);
switch((VirtualKeys)m.WParam.ToInt32())
{
case VirtualKeys.Escape:
@ -155,10 +161,11 @@ namespace Acacia.Controls
}
break;
}
ForwardKeyMessage(m);
break;
case WM.CHAR:
case WM.KEYUP:
System.Diagnostics.Trace.WriteLine("KEYMESSAGE: " + m);
ForwardKeyMessage(m);
break;
case WM.LBUTTONDOWN:
case WM.RBUTTONDOWN:
@ -196,6 +203,15 @@ namespace Acacia.Controls
return false;
}
private void ForwardKeyMessage(Message m)
{
System.Diagnostics.Trace.WriteLine("KEY: " + m);
if ((WM)m.Msg == WM.KEYDOWN)
{
OnPreviewKeyDown(new PreviewKeyDownEventArgs((Keys)m.WParam.ToInt32()));
}
}
// Cannot use visibility of _dropDown to keep the open state, as clicking on the button already
// hides the popup before the event handler is shown.
private bool _isDroppedDown;
@ -234,9 +250,13 @@ namespace Acacia.Controls
{
if (value)
{
_dropListHost.Control.Width = this.Width;
_dropListHost.Control.Height = 200;
_dropListHost.Control.Refresh();
// Calculate the height of the control
int maxHeight = GetDropDownHeightMax();
int minHeight = GetDropDownHeightMin();
Size prefSize = _dropControl.GetPreferredSize(new Size(Width, maxHeight));
_dropControl.Width = Util.Bound(prefSize.Width, Width, Width * 2);
_dropControl.Height = Util.Bound(prefSize.Height, minHeight, maxHeight);
// Show the drop down below the current control
_dropDown.Show(this.PointToScreen(new Point(0, Height)));
_dropDown.Capture = true;
}
@ -249,6 +269,9 @@ namespace Acacia.Controls
}
}
protected abstract int GetDropDownHeightMax();
protected abstract int GetDropDownHeightMin();
#endregion
#region Rendering
@ -306,7 +329,6 @@ namespace Acacia.Controls
protected override void OnPaint(PaintEventArgs e)
{
_style[COMBOBOXPARTS.CP_BORDER]?.DrawBackground(e.Graphics, _state.Root.State, ClientRectangle);
System.Diagnostics.Trace.WriteLine(string.Format("BUTTON: {0}", _stateButton.State));
_style[COMBOBOXPARTS.CP_DROPDOWNBUTTON]?.DrawBackground(e.Graphics, _stateButton.State, _stateButton.Rectangle);
}

28
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Controls/KComboBox.cs
View File

@ -1,4 +1,6 @@
using System;
using Acacia.Native;
using Acacia.Utils;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
@ -72,5 +74,29 @@ namespace Acacia.Controls
_list.DataSource = value;
}
}
protected override int GetDropDownHeightMax()
{
return Util.Bound(Items.Count, 1, MaxDropDownItems) * ItemHeight + _list.Margin.Vertical;
}
protected override int GetDropDownHeightMin()
{
return ItemHeight;
}
protected override void OnPreviewKeyDown(PreviewKeyDownEventArgs e)
{
switch(e.KeyCode)
{
case Keys.Down:
case Keys.Up:
User32.SendMessage(_list.Handle, (int)WM.KEYDOWN, new IntPtr((int)e.KeyCode), IntPtr.Zero);
break;
default:
base.OnPreviewKeyDown(e);
break;
}
}
}
}

10
src/AcaciaZPushPlugin/AcaciaZPushPlugin/Utils/Util.cs
View File

@ -179,5 +179,15 @@ namespace Acacia.Utils
int additional = (align - (size % align)) % align;
return size + additional;
}
public static NumType Bound<NumType>(NumType value, NumType min, NumType max)
where NumType : IComparable
{
if (value.CompareTo(min) < 0)
return min;
if (value.CompareTo(max) > 0)
return max;
return value;
}
}
}