From 785e82048ffc93d27d2e40ef8940cf994399f523 Mon Sep 17 00:00:00 2001 From: Mark Whalley Date: Wed, 31 Aug 2022 21:08:33 +0100 Subject: [PATCH 1/2] fix(#5012): fix --- src/transdialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transdialog.cpp b/src/transdialog.cpp index b6fb39d0dd..aa075475a9 100644 --- a/src/transdialog.cpp +++ b/src/transdialog.cpp @@ -306,7 +306,7 @@ void mmTransDialog::dataToControls() bSplit_->UnsetToolTip(); if (has_split) { - cbCategory_->SetLabelText(_("Split Transaction")); + cbCategory_->ChangeValue(_("Split Transaction")); cbCategory_->Disable(); m_textAmount->SetValue(Model_Splittransaction::get_total(m_local_splits)); m_trx_data.CATEGID = -1; From 4aeff579a3109aa1d30567fea3db84b715f79b91 Mon Sep 17 00:00:00 2001 From: Mark Whalley Date: Thu, 1 Sep 2022 00:27:21 +0100 Subject: [PATCH 2/2] fix(#5005): min size and tab scroll --- src/splittransactionsdialog.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/splittransactionsdialog.cpp b/src/splittransactionsdialog.cpp index 20381bc8e6..7570d42951 100644 --- a/src/splittransactionsdialog.cpp +++ b/src/splittransactionsdialog.cpp @@ -132,6 +132,7 @@ void mmSplitTransactionDialog::CreateControls() mmComboBoxCategory* cbc = new mmComboBoxCategory(slider_, wxID_HIGHEST + i); cbc->SetName(wxString::Format("category_box%i", i)); cbc->Bind(wxEVT_CHAR_HOOK, &mmSplitTransactionDialog::OnComboKey, this); + cbc->SetMinSize(wxSize(250,-1)); mmTextCtrl* val = new mmTextCtrl(slider_, wxID_HIGHEST + i, "" , wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT | wxTE_PROCESS_ENTER, mmCalcValidator(), m_currency); @@ -382,6 +383,7 @@ void mmSplitTransactionDialog::mmDoEnableLineById(int id) , wxString::Format("check_box%i", i)); mmComboBoxCategory* ncbc = new mmComboBoxCategory(slider_, wxID_HIGHEST + i); ncbc->Bind(wxEVT_CHAR_HOOK, &mmSplitTransactionDialog::OnComboKey, this); + ncbc->SetMinSize(wxSize(250,-1)); ncb->Disable(); ncb->Hide(); ncbc->SetName(wxString::Format("category_box%i", i)); @@ -435,6 +437,7 @@ void mmSplitTransactionDialog::OnTextEntered(wxCommandEvent& event) } UpdateSplitTotal(); + event.Skip(); } bool mmSplitTransactionDialog::mmDoCheckRow(int i, bool silent) @@ -495,6 +498,7 @@ void mmSplitTransactionDialog::OnFocusChange(wxChildFocusEvent& event) if (w && !w->GetName().empty()) { row_num_ = w->GetId() - wxID_HIGHEST; } + event.Skip(); } void mmSplitTransactionDialog::OnComboKey(wxKeyEvent& event)