Added a couple lines of code to suppress the opening of the phrasebox's dropdown list when exiting free translation mode, and also added the same two lines to suppress the dropdown list when exiting the KB Editor and Choose Translation dialogs.

Removed BEW's test code that intended to do the same job but was unsuccessful.

Author: pngbill

source/Adapt_It.cpp

@@ -24160,8 +24160,6 @@ bool CAdapt_ItApp::OnInit() // MFC calls this InitInstance()
     m_pServer = (AI_Server*)NULL;
 	m_bkSlash = _T("\\");
     m_bSelectionChange = FALSE; // init - used in KB Sharing Mgr
-    m_bSuppressDropDown = FALSE; // FALSE is default value, wanted for allowing dropdown list to be dropped.
-            // But a TRUE value needs to do a once-only suppression of the opening, then set the bool back to FALSE
     const wxString name = wxString::Format(_T("Adapt_ItApp-%s"), wxGetUserId().c_str());
     // on my Windows machine name = "Adapt_ItApp-Bill Martin"
     // on my Linux machine name = "Adapt_ItApp-wmartin"

source/Adapt_It.h

@@ -2381,19 +2381,6 @@ class CAdapt_ItApp : public wxApp
     // global from the App.
     //bool b_Spurious_Enter_Tab_Propagated;
 
-	// BEW 13jUL24 added, so that if the user accesses some other function, such as KB Editor,
-	// ChooseTranslation dialog, Preferences, does something there then returns to the focused
-	// location - the Phrasebox, and the Phrasebox has 2 or more items in the dropdown list,
-	// we can use a TRUE value of this new boolean to suppress dropping down the list. Why?
-	// The list is auto-dropped down, obscures part of next strip, and this is rarely what the
-	// user would want. E.g. it's a big nuisance when I do free translation, because I access
-	// the KB Editor lots of times and I don't want to have to close the drop down after I return
-	// having found out the info I want from the KB Editor. A FALSE value of this boolean just
-	// lets the legacy normal behaviour happen. The suppression is done in SetFocusAndSetSelectionAtLanding()
-	// and possibly may be needed in what follows that, the event.Skip() function.
-	// and possibly may be needed in what follows that, the event.Skip() function.
-	bool m_bSuppressDropDown; 
-
     // whm 15Apr2019 added the following m_nDropDownClickedItemIndex member in order to
     // correct index of a clicked on item if a sudden scroll at left-click would cause
     // a wrong index value for the item user intended to click on. It is initialized

source/Adapt_ItView.cpp

@@ -15968,11 +15968,13 @@ void CAdapt_ItView::OnButtonChooseTranslation(wxCommandEvent& WXUNUSED(event))
 			//int saveBoolean = pApp->m_bTypedNewAdaptationInChooseTranslation;
 			GetLayout()->PlaceBox(); // might not be needed? No it is needed - otherwise it rebuids list on 
 						// where I move phrasebox too & adds old locations meanings to the list there. Ouch.
-						
 			// I didn't notice the next line, that clobbers the boolean too early - so is probably why I
 			// got the error. Commenting it out should suffice
 			//pApp->m_bTypedNewAdaptationInChooseTranslation = FALSE; // gotta restore initialized value before leaving here
 
+			pApp->m_pTargetBox->CloseDropDown(); // whm 16July2024 added to suppress the opening of the dropdown list on exit from free trans mode
+			pApp->m_bChooseTransInitializePopup = FALSE; // whm 16July2024 added to suppress the opening of the dropdown list on exit from free trans mode
+
 #if defined (_DEBUG)
 			wxLogDebug(_T("view, OnButtonChooseTranslation, line  %d returning, at end simpler code block, pApp->m_bTypedNewAdaptationInChooseTranslation = %d"), __LINE__,
 				(int)pApp->m_bTypedNewAdaptationInChooseTranslation);
@@ -16053,7 +16055,11 @@ void CAdapt_ItView::OnButtonChooseTranslation(wxCommandEvent& WXUNUSED(event))
         // it is needed.
         // TODO: Determine if there really is a need for the PlaceBox() call here within the OnButtonChooseTranslation()
         // handler.
-        pApp->m_pTargetBox->m_Translation.Empty(); // If the PlaceBox() call can be removed, this can go back into Layout's PlaceBox() after the PopulateDropDownList() call
+
+		pApp->m_pTargetBox->CloseDropDown(); // whm 16July2024 added to suppress the opening of the dropdown list on exit from free trans mode
+		pApp->m_bChooseTransInitializePopup = FALSE; // whm 16July2024 added to suppress the opening of the dropdown list on exit from free trans mode
+
+		pApp->m_pTargetBox->m_Translation.Empty(); // If the PlaceBox() call can be removed, this can go back into Layout's PlaceBox() after the PopulateDropDownList() call
 #if defined (_DEBUG)
 		wxLogDebug(_T("view, OnButtonChooseTranslation, line  %d End legacy code block, pApp->m_bTypedNewAdaptationInChooseTranslation = %d"), __LINE__,
 			(int)pApp->m_bTypedNewAdaptationInChooseTranslation);
@@ -19013,13 +19019,6 @@ void CAdapt_ItView::OnToolsKbEditor(wxCommandEvent& WXUNUSED(event))
 			int len = pApp->m_targetPhrase.Length();
 			pApp->m_nStartChar = len;
 			pApp->m_nEndChar = len;
-
-			// BEW experiment: suppress having the dropdown dropped down when returning from
-			// having the KB Editor opened.
-			// Turn off my changes, by setting next line FALSE, until more development is to be done
-			pApp->m_bSuppressDropDown = FALSE; // next line is the only place where set TRUE, currently
-			//pApp->m_bSuppressDropDown = TRUE;  // The call in next line uses the TRUE value to skip over dropping
-											   // down the list, when 2 or more entries are in the list
             pApp->m_pTargetBox->SetFocusAndSetSelectionAtLanding();// whm 13Aug2018 modified
         }
 	}
@@ -19044,6 +19043,9 @@ void CAdapt_ItView::OnToolsKbEditor(wxCommandEvent& WXUNUSED(event))
         // enum internally and calls the SetupDropDownPhraseBoxForThisLocation() to initialize the dropdown
         // list - to include any changes made in the editor.
 		GetLayout()->PlaceBox(); // this call probably unneeded but no harm done
+		pApp->m_pTargetBox->CloseDropDown(); // whm 16July2024 added to suppress the opening of the dropdown list on exit from free trans mode
+		pApp->m_bChooseTransInitializePopup = FALSE; // whm 16July2024 added to suppress the opening of the dropdown list on exit from free trans mode
+
 //#if defined (_DEBUG)
 //        wxLogDebug(_T("view, OnToolsKbEditor, line  %d  -  AFTER PlaceBox, pApp->m_targetPhrase = %s phrasebox = %s ctItems = %d"), __LINE__,
 //            pApp->m_targetPhrase.c_str(), pApp->m_pTargetBox->GetTextCtrl()->GetValue().c_str(), pApp->m_pTargetBox->GetDropDownList()->GetCount());

source/Layout.cpp

@@ -1163,20 +1163,6 @@ void CLayout::PlaceBox(enum placeBoxSetup placeboxsetup)
 		// the dropdown phrasebox list, so I'm here commenting out the m_bDrafting test.
 		//if (m_pApp->m_bDrafting)
 
-		// BEW experiment 13Jul24, if m_pApp->m_bSuppressDropDown is TRUE, avoid calling SetupDropDownPhraseBoxForThisLocation();
-		// because on return from might have nothing changed in KB, but if something was changed, I'd need to do more. But
-		// let's see if returning here, after clearing boolean, gives no dropdown of list. Yep, it succeeds - the list was not
-		// opened. What remains is to provide code that would update the list contents if KB Editor changes values for what's
-		// at the active location - changes at items in the KB Editor which is not pointing at the active location can be accepted
-		// and stored permanently - it's only when in the Editor we are looking at what the phrasebox's list needs to be changed.
-		// Probably we can grab from code further below to do that, we then just need to avoid opening the list - even though we've
-		// updated its contents. TODO... maybe Bill can take this further.
-		if (m_pApp->m_bSuppressDropDown)
-		{
-			m_pApp->m_bSuppressDropDown = FALSE;
-			return;
-		}
-
 		if (placeboxsetup == initializeDropDown)
 		{
 			m_pApp->m_pTargetBox->SetupDropDownPhraseBoxForThisLocation();

source/MainFrm.cpp

@@ -4656,6 +4656,8 @@ void CMainFrame::OnIdle(wxIdleEvent& event)
 		CCell* pCell = pApp->m_pActivePile->GetCell(1);
 		int activeSN = pApp->m_pActivePile->GetSrcPhrase()->m_nSequNumber;
 		pView->PlacePhraseBox(pCell,1);
+		pApp->m_pTargetBox->CloseDropDown(); // whm 16July2024 added to suppress the opening of the dropdown list on exit from free trans mode
+		pApp->m_bChooseTransInitializePopup = FALSE; // whm 16July2024 added to suppress the opening of the dropdown list on exit from free trans mode
 		pApp->m_pActivePile = pView->GetPile(activeSN); // restore active pile ptr
 		pView->Invalidate();
 	}

source/PhraseBox.cpp

@@ -9681,23 +9681,8 @@ void CPhraseBox::SetFocusAndSetSelectionAtLanding()
     // View menu's 'Select Copied Source' toggle menu item. 
     int len = this->GetTextCtrl()->GetValue().Length();
 	// Never select phrasebox contents when there a > 1 items in list.
-
-	// BEW 13Jul24 experiment: skip dropping down the list if KB Editor has set
-	// pApp->m_bSuppressDropDown to TRUE
-	CMyListBox* pMyDropdownList = this->GetDropDownList();
-	int listCount = pMyDropdownList->GetCount();
-	//if (this->GetDropDownList()->GetCount() > 1)
-	if (gpApp->m_bSuppressDropDown == TRUE)
-	{ 
-		int halt_here = 1;
-		// trace from here to find where the drop down is asked to drop...
-		//gpApp->m_bSuppressDropDown = FALSE; // restore default
-		return;
-	}
-
-	if(listCount > 1)
+	if (this->GetDropDownList()->GetCount() > 1)
 	{
-    
 		// The dropdown list has more than one item so it will be open and displaying its
 		// list items. In this situation we set the cursor to the end of the text, but
 		// not during editing - i.e., within the OnPhraseBoxChanged(), otherwise the cursor
@@ -9727,5 +9712,5 @@ void CPhraseBox::SetFocusAndSetSelectionAtLanding()
         else
             this->GetTextCtrl()->SetSelection(len, len); // Set insertion point at end of text.
     }
-	
+
 }