]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix handling of mouse events on header line with tab-line
authorEli Zaretskii <eliz@gnu.org>
Fri, 18 Oct 2019 14:55:21 +0000 (17:55 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 18 Oct 2019 14:55:21 +0000 (17:55 +0300)
* src/window.c (coordinates_in_window): Fix conditions for
coordinates being on the window's header line when that
window also displays a tab-line.  (Bug#37807)

src/window.c

index e4bb2daeb38f37374c8dca6321800674afc92add..0fa0bdf7b92ecd7019349bfd43075778b46e15f5 100644 (file)
@@ -1321,8 +1321,10 @@ coordinates_in_window (register struct window *w, int x, int y)
               && y < top_y + CURRENT_TAB_LINE_HEIGHT (w)
               && (part = ON_TAB_LINE))
           || (window_wants_header_line (w)
-              && y < top_y + CURRENT_TAB_LINE_HEIGHT (w)
-                           + CURRENT_HEADER_LINE_HEIGHT (w)
+              && y < top_y + CURRENT_HEADER_LINE_HEIGHT (w)
+              + (window_wants_tab_line (w)
+                 ? CURRENT_TAB_LINE_HEIGHT (w)
+                 : 0)
               && (part = ON_HEADER_LINE)))
     {
       /* If it's under/over the scroll bar portion of the mode/header