diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2022-02-19 22:33:47 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2022-02-19 22:35:34 +0100 |
| commit | c145b337cbc5d7c8dc09859d51093a6727005ef8 (patch) | |
| tree | 0e6dfccfa2cdcd3c5f1cd1e2055bb8f0acdc6ca2 /src/Main | |
| parent | c68e982f39af58d4ab26d8bb9f703496ccb06043 (diff) | |
| download | VeraCrypt-c145b337cbc5d7c8dc09859d51093a6727005ef8.tar.gz VeraCrypt-c145b337cbc5d7c8dc09859d51093a6727005ef8.zip | |
Linux/MacOSX: Fix hidden volume settings not correctly displayed when enabling hidden volume protection in mount options window
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/Forms/MountOptionsDialog.cpp | 3 | ||||
| -rw-r--r-- | src/Main/Forms/VolumePasswordPanel.cpp | 7 | ||||
| -rw-r--r-- | src/Main/Forms/VolumePasswordPanel.h | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp index 99355020..04410922 100644 --- a/src/Main/Forms/MountOptionsDialog.cpp +++ b/src/Main/Forms/MountOptionsDialog.cpp @@ -88,7 +88,8 @@ namespace VeraCrypt OptionsButton->SetLabel (OptionsButtonLabel + L" >"); OptionsPanel->Show (false); - ProtectionPasswordPanel = new VolumePasswordPanel (OptionsPanel, &options, options.ProtectionPassword, true, options.ProtectionKeyfiles, false, true, true, false, true, true, LangString["IDT_HIDDEN_PROT_PASSWD"]); + ProtectionPasswordPanel = new VolumePasswordPanel (ProtectionSizer->GetStaticBox(), &options, options.ProtectionPassword, true, options.ProtectionKeyfiles, false, true, true, false, true, true, LangString["IDT_HIDDEN_PROT_PASSWD"]); + ProtectionPasswordPanel->TopOwnerParent = this; ProtectionPasswordSizer->Add (ProtectionPasswordPanel, 1, wxALL | wxEXPAND); UpdateDialog(); diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp index ac30075e..bb1f0c78 100644 --- a/src/Main/Forms/VolumePasswordPanel.cpp +++ b/src/Main/Forms/VolumePasswordPanel.cpp @@ -19,7 +19,7 @@ namespace VeraCrypt { VolumePasswordPanel::VolumePasswordPanel (wxWindow* parent, MountOptions* options, shared_ptr <VolumePassword> password, bool disableTruecryptMode, shared_ptr <KeyfileList> keyfiles, bool enableCache, bool enablePassword, bool enableKeyfiles, bool enableConfirmation, bool enablePkcs5Prf, bool isMountPassword, const wxString &passwordLabel) - : VolumePasswordPanelBase (parent), Keyfiles (new KeyfileList), EnablePimEntry (true) + : VolumePasswordPanelBase (parent), TopOwnerParent(NULL), Keyfiles (new KeyfileList), EnablePimEntry (true) { size_t maxPasswordLength = CmdLine->ArgUseLegacyPassword? VolumePassword::MaxLegacySize : VolumePassword::MaxSize; if (keyfiles) @@ -493,6 +493,7 @@ namespace VeraCrypt { if (EnablePimEntry) { + wxWindow* layoutParent = TopOwnerParent? TopOwnerParent : GetParent(); PimCheckBox->Show (false); VolumePimStaticText->Show (true); VolumePimTextCtrl->Show (true); @@ -506,8 +507,8 @@ namespace VeraCrypt Fit(); } - GetParent()->Layout(); - GetParent()->Fit(); + layoutParent->Layout(); + layoutParent->Fit(); } } diff --git a/src/Main/Forms/VolumePasswordPanel.h b/src/Main/Forms/VolumePasswordPanel.h index cac6c37b..e9b81e29 100644 --- a/src/Main/Forms/VolumePasswordPanel.h +++ b/src/Main/Forms/VolumePasswordPanel.h @@ -45,6 +45,7 @@ namespace VeraCrypt bool UpdatePimHelpText (bool pimChanged); Event UpdateEvent; + wxWindow* TopOwnerParent; // use to handle layout when embedded inside sizer child protected: void SetPimValidator (); |