Browse Source
Merge branch 'master' into feature/customFonts
repros/custom-fonts-pr
Benedikt Schroeder
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
8 deletions
-
src/Avalonia.Controls/AutoCompleteBox.cs
-
src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
|
|
|
@ -1954,6 +1954,10 @@ namespace Avalonia.Controls |
|
|
|
// 1. Minimum prefix length
|
|
|
|
// 2. If a delay timer is in use, use it
|
|
|
|
bool populateReady = newText.Length >= MinimumPrefixLength && MinimumPrefixLength >= 0; |
|
|
|
if(populateReady && MinimumPrefixLength == 0 && String.IsNullOrEmpty(newText) && String.IsNullOrEmpty(SearchText)) |
|
|
|
{ |
|
|
|
populateReady = false; |
|
|
|
} |
|
|
|
_userCalledPopulate = populateReady ? userInitiated : false; |
|
|
|
|
|
|
|
// Update the interface and values only as necessary
|
|
|
|
|
|
|
|
@ -1187,27 +1187,21 @@ namespace Avalonia.Win32.Interop |
|
|
|
[Flags] |
|
|
|
public enum OpenFileNameFlags |
|
|
|
{ |
|
|
|
|
|
|
|
OFN_ALLOWMULTISELECT = 0x00000200, |
|
|
|
|
|
|
|
OFN_EXPLORER = 0x00080000, |
|
|
|
|
|
|
|
OFN_HIDEREADONLY = 0x00000004, |
|
|
|
|
|
|
|
OFN_NOREADONLYRETURN = 0x00008000, |
|
|
|
|
|
|
|
OFN_OVERWRITEPROMPT = 0x00000002 |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public enum HRESULT : long |
|
|
|
public enum HRESULT : uint |
|
|
|
{ |
|
|
|
S_FALSE = 0x0001, |
|
|
|
S_OK = 0x0000, |
|
|
|
E_INVALIDARG = 0x80070057, |
|
|
|
E_OUTOFMEMORY = 0x8007000E, |
|
|
|
E_NOTIMPL = 0x80004001, |
|
|
|
E_UNEXPECTED = 0x8000FFFF, |
|
|
|
E_UNEXPECTED = 0x8000FFFF |
|
|
|
} |
|
|
|
|
|
|
|
public enum Icons |
|
|
|
|