From 6c147de4abd99ee57dd1d2ba855ac756a58a7fff Mon Sep 17 00:00:00 2001 From: "v.audacity" Date: Tue, 22 Feb 2011 08:57:13 +0000 Subject: [PATCH] Bug 113 (P2) - Dependencies dialogue not safe against user error Fix for resize improvement per http://bugzilla.audacityteam.org/show_bug.cgi?id=113#c42. File size column is now always 120px. The rest, less 8px for border, is for file name. --- src/Dependencies.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp index bc551ed32..be1b64d87 100644 --- a/src/Dependencies.cpp +++ b/src/Dependencies.cpp @@ -272,6 +272,7 @@ private: void OnCancel(wxCommandEvent& evt); void OnCopySelectedFiles(wxCommandEvent &evt); void OnList(wxListEvent &evt); + void OnSize(wxSizeEvent &evt); void OnNo(wxCommandEvent &evt); void OnYes(wxCommandEvent &evt); @@ -304,6 +305,7 @@ BEGIN_EVENT_TABLE(DependencyDialog, wxDialog) EVT_LIST_ITEM_SELECTED(FileListID, DependencyDialog::OnList) EVT_LIST_ITEM_DESELECTED(FileListID, DependencyDialog::OnList) EVT_BUTTON(CopySelectedFilesButtonID, DependencyDialog::OnCopySelectedFiles) + EVT_SIZE(DependencyDialog::OnSize) EVT_BUTTON(wxID_NO, DependencyDialog::OnNo) // mIsSaving ? "Cancel Save" : "Save without Copying" EVT_BUTTON(wxID_YES, DependencyDialog::OnYes) // "Copy All Files (Safer)" EVT_BUTTON(wxID_CANCEL, DependencyDialog::OnCancel) // "Cancel Save" @@ -469,6 +471,19 @@ void DependencyDialog::OnList(wxListEvent &evt) mFileListCtrl->GetSelectedItemCount() > 0); } +void DependencyDialog::OnSize(wxSizeEvent &evt) +{ + int fileListCtrlWidth, fileListCtrlHeight; + mFileListCtrl->GetSize(&fileListCtrlWidth, &fileListCtrlHeight); + + // File path is column 0. File size is column 1. + // File size column is always 120 px wide. + // Also subtract 8 from file path column width for borders. + mFileListCtrl->SetColumnWidth(0, fileListCtrlWidth - 120 - 8); + mFileListCtrl->SetColumnWidth(1, 120); + wxDialog::OnSize(evt); +} + void DependencyDialog::OnNo(wxCommandEvent &evt) { SaveFutureActionChoice();