mirror of
https://github.com/veracrypt/VeraCrypt
synced 2024-11-23 19:43:27 +01:00
macOS: Fix near zero width PIM input box and simplify wxTextValidator logic (#1274)
* macOS: Fix issue where PIM box has no width in Wizard VolumePimTextCtrl has a problem with width on macOS which we can fix by adjusting the proportions of the elements inside the PimSizer, which seems like a better solution than using a forced minimum size in pixels. Adjacent, simplifies the validator logic for digits in PIM field. Fixes #1219
This commit is contained in:
parent
1a21ea8d73
commit
ff93a6021f
@ -45,10 +45,10 @@ namespace VeraCrypt
|
||||
BufferSizeChoice->Select (1);
|
||||
|
||||
UpdateBenchmarkList ();
|
||||
|
||||
wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST); // wxFILTER_NUMERIC does not exclude - . , etc.
|
||||
const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
|
||||
validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
|
||||
|
||||
VolumePimText->SetMinSize (wxSize (Gui->GetCharWidth (VolumePimText) * 15, -1));
|
||||
|
||||
wxTextValidator validator (wxFILTER_DIGITS);
|
||||
VolumePimText->SetValidator (validator);
|
||||
|
||||
Layout();
|
||||
|
@ -172,9 +172,7 @@ namespace VeraCrypt
|
||||
|
||||
void VolumePasswordPanel::SetPimValidator ()
|
||||
{
|
||||
wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST); // wxFILTER_NUMERIC does not exclude - . , etc.
|
||||
const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
|
||||
validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
|
||||
wxTextValidator validator (wxFILTER_DIGITS);
|
||||
VolumePimTextCtrl->SetValidator (validator);
|
||||
}
|
||||
|
||||
|
@ -23,6 +23,7 @@ namespace VeraCrypt
|
||||
VolumePimWizardPage::VolumePimWizardPage (wxPanel* parent)
|
||||
: VolumePimWizardPageBase (parent)
|
||||
{
|
||||
VolumePimTextCtrl->SetMinSize (wxSize (Gui->GetCharWidth (VolumePimTextCtrl) * 15, -1));
|
||||
SetPimValidator ();
|
||||
}
|
||||
|
||||
@ -91,9 +92,7 @@ namespace VeraCrypt
|
||||
|
||||
void VolumePimWizardPage::SetPimValidator ()
|
||||
{
|
||||
wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST); // wxFILTER_NUMERIC does not exclude - . , etc.
|
||||
const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
|
||||
validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
|
||||
wxTextValidator validator (wxFILTER_DIGITS);
|
||||
VolumePimTextCtrl->SetValidator (validator);
|
||||
}
|
||||
|
||||
|
@ -73,9 +73,7 @@ namespace VeraCrypt
|
||||
|
||||
VolumeSizeTextCtrl->SetMinSize (wxSize (Gui->GetCharWidth (VolumeSizeTextCtrl) * 20, -1));
|
||||
|
||||
wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST); // wxFILTER_NUMERIC does not exclude - . , etc.
|
||||
const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
|
||||
validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
|
||||
wxTextValidator validator (wxFILTER_DIGITS);
|
||||
VolumeSizeTextCtrl->SetValidator (validator);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user