Del should not delete an annotation if editing content (fixes #3878)

src/AppTools.cpp

@@ -414,7 +414,7 @@ bool ExtendedEditWndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM) {
 
     switch (msg) {
         case WM_LBUTTONDOWN:
-            delayFocus = !IsFocused(hwnd);
+            delayFocus = !HwndIsFocused(hwnd);
             return true;
 
         case WM_LBUTTONUP: {

src/EditAnnotations.cpp

@@ -408,6 +408,12 @@ bool EditAnnotationsWindow::PreTranslateMessage(MSG& msg) {
     if (msg.message == WM_KEYDOWN) {
         int key = (int)msg.wParam;
         if (key == VK_DELETE) {
+            // we don't want this to trigger in edit control
+            HWND focused = ::GetFocus();
+            TempStr cls = HwndGetClassName(focused);
+            if (str::EqI(cls, "Edit")) {
+                return false;
+            }
             DeleteSelectedAnnotation(this);
             return true;
         }

src/SearchAndDDE.cpp

@@ -94,7 +94,7 @@ void FindFirst(MainWindow* win) {
 
     // Don't show a dialog if we don't have to - use the Toolbar instead
     if (gGlobalPrefs->showToolbar && !win->isFullScreen && !win->presentation) {
-        if (IsFocused(win->hwndFindEdit)) {
+        if (HwndIsFocused(win->hwndFindEdit)) {
             SendMessageW(win->hwndFindEdit, WM_SETFOCUS, 0, 0);
         } else {
             SetFocus(win->hwndFindEdit);

src/Selection.cpp

@@ -352,7 +352,7 @@ void OnSelectAll(MainWindow* win, bool textOnly) {
         return;
     }
 
-    if (IsFocused(win->hwndFindEdit) || IsFocused(win->hwndPageEdit)) {
+    if (HwndIsFocused(win->hwndFindEdit) || HwndIsFocused(win->hwndPageEdit)) {
         EditSelectAll(GetFocus());
         return;
     }

src/SumatraPDF.cpp

@@ -3646,7 +3646,7 @@ static void ChangeZoomLevel(MainWindow* win, float newZoom, bool pagesContinuous
 }
 
 static void FocusPageNoEdit(HWND hwndPageEdit) {
-    if (IsFocused(hwndPageEdit)) {
+    if (HwndIsFocused(hwndPageEdit)) {
         SendMessageW(hwndPageEdit, WM_SETFOCUS, 0, 0);
     } else {
         SetFocus(hwndPageEdit);
@@ -4338,7 +4338,8 @@ void SetSidebarVisibility(MainWindow* win, bool tocVisible, bool showFavorites)
     // TODO: make this a per-window setting as well?
     gGlobalPrefs->showFavorites = showFavorites;
 
-    if ((!tocVisible && IsFocused(win->tocTreeView->hwnd)) || (!showFavorites && IsFocused(win->favTreeView->hwnd))) {
+    if ((!tocVisible && HwndIsFocused(win->tocTreeView->hwnd)) ||
+        (!showFavorites && HwndIsFocused(win->favTreeView->hwnd))) {
         SetFocus(win->hwndFrame);
     }
 
@@ -4482,7 +4483,7 @@ static void CopySelectionInTabToClipboard(WindowTab* tab) {
     if (!tab || !tab->win) {
         return;
     }
-    if (IsFocused(tab->win->hwndFindEdit) || IsFocused(tab->win->hwndPageEdit)) {
+    if (HwndIsFocused(tab->win->hwndFindEdit) || HwndIsFocused(tab->win->hwndPageEdit)) {
         SendMessageW(GetFocus(), WM_COPY, 0, 0);
         return;
     }
@@ -5182,7 +5183,7 @@ static LRESULT FrameOnCommand(MainWindow* win, HWND hwnd, UINT msg, WPARAM wp, L
         }
 
         case CmdMoveFrameFocus:
-            if (!IsFocused(win->hwndFrame)) {
+            if (!HwndIsFocused(win->hwndFrame)) {
                 SetFocus(win->hwndFrame);
             } else if (win->tocVisible) {
                 SetFocus(win->tocTreeView->hwnd);
@@ -5602,7 +5603,7 @@ LRESULT CALLBACK WndProcSumatraFrame(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
             // handled as expected)
             int x = GET_X_LPARAM(lp);
             int y = GET_Y_LPARAM(lp);
-            if (win && (x == -1) && (y == -1) && !IsFocused(win->tocTreeView->hwnd)) {
+            if (win && (x == -1) && (y == -1) && !HwndIsFocused(win->tocTreeView->hwnd)) {
                 return SendMessageW(win->hwndCanvas, WM_CONTEXTMENU, wp, lp);
             }
             return DefWindowProc(hwnd, msg, wp, lp);

src/Toolbar.cpp

@@ -286,7 +286,7 @@ void ShowOrHideToolbar(MainWindow* win) {
         ShowWindow(win->hwndReBar, SW_SHOW);
     } else {
         // Move the focus out of the toolbar
-        if (IsFocused(win->hwndFindEdit) || IsFocused(win->hwndPageEdit)) {
+        if (HwndIsFocused(win->hwndFindEdit) || HwndIsFocused(win->hwndPageEdit)) {
             SetFocus(win->hwndFrame);
         }
         ShowWindow(win->hwndReBar, SW_HIDE);

src/utils/WinUtil.cpp

@@ -1193,7 +1193,7 @@ void DrawLine(HDC hdc, const Rect& rect) {
     LineTo(hdc, rect.x + rect.dx, rect.y + rect.dy);
 }
 
-bool IsFocused(HWND hwnd) {
+bool HwndIsFocused(HWND hwnd) {
     return GetFocus() == hwnd;
 }
 
@@ -1204,6 +1204,13 @@ bool IsCursorOverWindow(HWND hwnd) {
     return rcWnd.Contains({pt.x, pt.y});
 }
 
+TempStr HwndGetClassName(HWND hwnd) {
+    WCHAR buf[512] = {0};
+    int n = GetClassNameW(hwnd, buf, dimof(buf));
+    CrashIf(n == 0);
+    return ToUtf8Temp(buf);
+}
+
 Point HwndGetCursorPos(HWND hwnd) {
     POINT pt;
     if (!GetCursorPos(&pt)) {

src/utils/WinUtil.h

@@ -120,8 +120,10 @@ int HdcDrawText(HDC hdc, const char* s, const Point& pos, uint fmt, HFONT font =
 Size HdcMeasureText(HDC hdc, const char* s, uint format, HFONT font = nullptr);
 Size HdcMeasureText(HDC hdc, const char* s, HFONT font = nullptr);
 
-bool IsFocused(HWND);
+bool HwndIsFocused(HWND);
 bool IsCursorOverWindow(HWND);
+
+TempStr HwndGetClassName(HWND hwnd);
 Point HwndGetCursorPos(HWND hwnd);
 int MapWindowPoints(HWND, HWND, Point*, int);
 void HwndScreenToClient(HWND, Point&);

src/wingui/WinGui.cpp

@@ -1137,7 +1137,7 @@ void Wnd::SetFocus() const {
 }
 
 bool Wnd::IsFocused() const {
-    BOOL isFocused = ::IsFocused(hwnd);
+    BOOL isFocused = HwndIsFocused(hwnd);
     return tobool(isFocused);
 }