From: Martin Rudalics <rudalics@gmx.at>
Date: Fri, 3 Apr 2020 08:31:35 +0000 (+0200)
Subject: Don't draw GTK's internal border and tab bar on top of each other
X-Git-Tag: emacs-27.0.91~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4f51d0a2e;p=emacs.git

Don't draw GTK's internal border and tab bar on top of each other

* src/xterm.c (x_clear_under_internal_border): For GTK builds
have 'margin' count in the height of the tab bar to avoid that
tab bar and internal border are drawn on top of each other.
---

diff --git a/src/xterm.c b/src/xterm.c
index 2ba3c009402..bda976fcbbd 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1291,11 +1291,7 @@ x_clear_under_internal_border (struct frame *f)
       int border = FRAME_INTERNAL_BORDER_WIDTH (f);
       int width = FRAME_PIXEL_WIDTH (f);
       int height = FRAME_PIXEL_HEIGHT (f);
-#ifdef USE_GTK
-      int margin = 0;
-#else
       int margin = FRAME_TOP_MARGIN_HEIGHT (f);
-#endif
       int face_id =
 	!NILP (Vface_remapping_alist)
 	? lookup_basic_face (NULL, f, INTERNAL_BORDER_FACE_ID)