mirrors/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-05-28 15:30:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix volume size unit choice width

Browse Source 
The volume size page populates the unit wxChoice after the generated base class has already fit the empty control. On macOS this can leave the closed choice too narrow, truncating MiB to .... Measure the localized unit labels after appending them and set a sufficient minimum width.
This commit is contained in:
Mounir IDRASSI
2026-05-27 11:23:58 +02:00
parent ce20a24aa5
commit 08b433012e
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Main/Forms/VolumeSizeWizardPage.cpp
View File

@@ -30,6 +30,23 @@ namespace VeraCrypt
VolumeSizePrefixChoice->Append (LangString["TB"], reinterpret_cast <void *> (4));
VolumeSizePrefixChoice->Select (Prefix::MB);
// The generated base class fits this choice while it is still empty.
// Size it after adding localized labels so Cocoa does not truncate "MiB" to "...".
wxCoord maxPrefixTextWidth = 0;
for (unsigned int i = 0; i < VolumeSizePrefixChoice->GetCount(); ++i)
{
wxCoord textWidth, textHeight;
VolumeSizePrefixChoice->GetTextExtent (VolumeSizePrefixChoice->GetString (i), &textWidth, &textHeight);
if (textWidth > maxPrefixTextWidth)
maxPrefixTextWidth = textWidth;
}
wxSize prefixChoiceSize = VolumeSizePrefixChoice->GetBestSize();
int minPrefixChoiceWidth = maxPrefixTextWidth + Gui->GetCharWidth (VolumeSizePrefixChoice) * 6;
if (prefixChoiceSize.GetWidth() < minPrefixChoiceWidth)
prefixChoiceSize.SetWidth (minPrefixChoiceWidth);
VolumeSizePrefixChoice->SetMinSize (prefixChoiceSize);
wxLongLong diskSpace = 0;
if (!wxGetDiskSpace (wxFileName (wstring (volumePath)).GetPath(), nullptr, &diskSpace))
{