mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 08:11:05 -08:00
Code Issues Projects Releases Wiki Activity

Avoid lowering child frames below scroll bars on X

Browse source 
* src/xterm.c (x_lower_frame_1): New function.
(x_lower_frame): Avoid calling XLowerFrame when there is a
parent with scroll bars.
This commit is contained in:
Po Lu 2022-08-16 09:30:08 +08:00
parent f73d4d86f8
commit 1973d4ac1b
1 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/xterm.c
View file

@ -26167,18 +26167,52 @@ x_raise_frame (struct frame *f)
unblock_input ();
}
static void
x_lower_frame_1 (struct frame *f)
{
Window *windows;
Lisp_Object frame, tail;
struct frame *sibling;
windows = alloca (2 * sizeof *windows);
/* Lowering a child frame leads to the window being put below any
scroll bars on the parent. To avoid that, restack the child
frame below all of its siblings instead of just lowering it. */
FOR_EACH_FRAME (tail, frame)
{
sibling = XFRAME (frame);
if (sibling == f)
continue;
if (FRAME_PARENT_FRAME (sibling)
!= FRAME_PARENT_FRAME (f))
continue;
windows[0] = FRAME_OUTER_WINDOW (sibling);
windows[1] = FRAME_OUTER_WINDOW (f);
XRestackWindows (FRAME_X_DISPLAY (f), windows, 2);
}
}
/* Lower frame F. */
static void
x_lower_frame (struct frame *f)
{
if (FRAME_VISIBLE_P (f))
{
block_input ();
XLowerWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f));
XFlush (FRAME_X_DISPLAY (f));
unblock_input ();
}
if (FRAME_PARENT_FRAME (f)
&& (FRAME_HAS_VERTICAL_SCROLL_BARS (FRAME_PARENT_FRAME (f))
|| FRAME_HAS_HORIZONTAL_SCROLL_BARS (FRAME_PARENT_FRAME (f))))
x_lower_frame_1 (f);
else
XLowerWindow (FRAME_X_DISPLAY (f),
FRAME_OUTER_WINDOW (f));
XFlush (FRAME_X_DISPLAY (f));
#ifdef HAVE_XWIDGETS
/* Make sure any X windows owned by xwidget views of the parent
still display below the lowered frame. */