1
0
Эх сурвалжийг харах

Handle enter key from search edit box

ScottBrogden 9 жил өмнө
parent
commit
09e5d8c910
5 өөрчлөгдсөн 16 нэмэгдсэн , 15 устгасан
  1. 1 1
      EditWithButton.cpp
  2. 1 1
      QListCtrl.h
  3. 12 11
      QPasteWnd.cpp
  4. 1 1
      QPasteWnd.h
  5. 1 1
      SearchEditBox.cpp

+ 1 - 1
EditWithButton.cpp

@@ -91,7 +91,7 @@ BOOL CEditWithButton::PreTranslateMessage(MSG* pMsg)
 				{
 					if(g_Opt.m_bFindAsYouType)
 					{
-						pWnd->SendMessage(NM_DBL_CLICK, 0, 0);
+						pWnd->SendMessage(NM_SEARCH_ENTER_PRESSED, 0, 0);
 					}
 					else
 					{

+ 1 - 1
QListCtrl.h

@@ -14,7 +14,7 @@
 #include "Accels.h"
 #include "GdiImageDrawer.h"
 
-#define NM_DBL_CLICK				WM_USER+0x100
+#define NM_SEARCH_ENTER_PRESSED		WM_USER+0x100
 #define NM_RIGHT					WM_USER+0x101
 #define NM_LEFT						WM_USER+0x102
 #define NM_END						WM_USER+0x103

+ 12 - 11
QPasteWnd.cpp

@@ -163,7 +163,7 @@ ON_COMMAND(ID_QUICKOPTIONS_ELEVATEPREVILEGESTOPASTEINTOELEVATEDAPPS, OnElevateAp
 ON_WM_DESTROY()
 
 //}}AFX_MSG_MAP
-ON_MESSAGE(NM_DBL_CLICK, OnListDblClick)
+ON_MESSAGE(NM_SEARCH_ENTER_PRESSED, OnSearchEnterKeyPressed)
 ON_MESSAGE(NM_END, OnListEnd)
 ON_MESSAGE(CB_SEARCH, OnSearch)
 ON_MESSAGE(NM_DELETE, OnDelete)
@@ -948,9 +948,15 @@ LRESULT CQPasteWnd::OnListMoveSelectionToGroup(WPARAM wParam, LPARAM lParam)
 	return TRUE;
 }
 
-LRESULT CQPasteWnd::OnListDblClick(WPARAM wParam, LPARAM lParam)
+LRESULT CQPasteWnd::OnSearchEnterKeyPressed(WPARAM wParam, LPARAM lParam)
 {
-	//DoAction(ActionEnums::PASTE_SELECTED);
+	MSG msg;
+	msg.lParam = 0;
+	msg.wParam = VK_RETURN;
+	msg.message = WM_KEYDOWN;
+	if (CheckActions(&msg) == false)
+	{
+	}
     return TRUE;
 }
 
@@ -3262,14 +3268,9 @@ bool CQPasteWnd::DoActionToggleShowPersistant()
 
 bool CQPasteWnd::DoActionPasteSelected()
 {
-	if(::GetFocus() == m_lstHeader.GetSafeHwnd())
-	{
-		CSpecialPasteOptions pasteOptions;
-		OpenSelection(pasteOptions);
-		return true;
-	}
-
-	return false;
+	CSpecialPasteOptions pasteOptions;
+	OpenSelection(pasteOptions);
+	return true;	
 }
 
 bool CQPasteWnd::DoActionDeleteSelected()

+ 1 - 1
QPasteWnd.h

@@ -351,7 +351,7 @@ protected:
     afx_msg void OnUpdateMenuDelete(CCmdUI *pCmdUI);
     afx_msg void OnUpdateMenuProperties(CCmdUI *pCmdUI);
     afx_msg void OnDestroy();
-    afx_msg LRESULT OnListDblClick(WPARAM wParam, LPARAM lParam);
+    afx_msg LRESULT OnSearchEnterKeyPressed(WPARAM wParam, LPARAM lParam);
     afx_msg LRESULT OnListEnd(WPARAM wParam, LPARAM lParam);
     afx_msg LRESULT OnSearch(WPARAM wParam, LPARAM lParam);
     afx_msg LRESULT OnDelete(WPARAM wParam, LPARAM lParam);

+ 1 - 1
SearchEditBox.cpp

@@ -45,7 +45,7 @@ BOOL CSearchEditBox::PreTranslateMessage(MSG* pMsg)
 				{
 					if(g_Opt.m_bFindAsYouType)
 					{
-						pWnd->SendMessage(NM_DBL_CLICK, 0, 0);
+						pWnd->SendMessage(NM_SEARCH_ENTER_PRESSED, 0, 0);
 					}
 					else
 					{