Skip to content

Linux/FreeBSD/macOS: Column widths correct initially and on update #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
idrassi merged 1 commit into from
Jun 9, 2025
Merged

Linux/FreeBSD/macOS: Column widths correct initially and on update #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Main/Forms/MainFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,7 +1687,6 @@ namespace VeraCrypt
}

VolumeInfoList protectionTriggeredVolumes;
SlotListCtrl->SetColumnWidth(0, wxLIST_AUTOSIZE);

// Update list
long prevItemIndex = -1;
Expand Down Expand Up @@ -1773,8 +1772,10 @@ namespace VeraCrypt
}
}

if (listChanged)
if (listChanged) {
SlotListCtrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
OnListChanged();
}

foreach (shared_ptr <VolumeInfo> volume, protectionTriggeredVolumes)
OnHiddenVolumeProtectionTriggered (volume);
Expand Down
6 changes: 5 additions & 1 deletion src/Main/GraphicUserInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2072,8 +2072,12 @@ namespace VeraCrypt
{
item.SetText (field);
listCtrl->SetItem (item);
if (item.GetColumn() == 3 || item.GetColumn() == 4)
if ((item.GetColumn() == 3 || item.GetColumn() == 4) && !item.GetText().IsEmpty())
listCtrl->SetColumnWidth(item.GetColumn(), wxLIST_AUTOSIZE);
// SlotListCtrl headers do not automatically move with column widths changing on macOS
#ifdef TC_MACOSX
listCtrl->Update();
#endif
changed = true;
}
}
Expand Down