mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-13 06:50:39 -08:00
Code Issues Projects Releases Wiki Activity

Fix display of internal border in child frames on pgtk

Browse source 
* src/pgtkfns.c (Fx_create_frame): Fix child frame border
resource names.
* src/pgtkterm.c (pgtk_clear_under_internal_border): Fix test
for child frames.  (bug#53018)
This commit is contained in:
Po Lu 2022-01-05 10:16:06 +08:00
parent 6719a3ccab
commit a7dbbcac57
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/pgtkfns.c
View file

@ -1454,9 +1454,6 @@ This function is an internal primitive--use `make-frame' instead. */ )
gui_default_parameter (f, parms, Qborder_width, make_fixnum (0),
"borderWidth", "BorderWidth", RES_TYPE_NUMBER);
/* This defaults to 1 in order to match xterm. We recognize either
internalBorderWidth or internalBorder (which is what xterm calls
it). */
if (NILP (Fassq (Qinternal_border_width, parms)))
{
Lisp_Object value;
@ -1468,13 +1465,18 @@ This function is an internal primitive--use `make-frame' instead. */ )
parms = Fcons (Fcons (Qinternal_border_width, value), parms);
}
gui_default_parameter (f, parms, Qinternal_border_width,
make_fixnum (0),
"internalBorderWidth", "internalBorderWidth",
RES_TYPE_NUMBER);
/* Same for child frames. */
if (NILP (Fassq (Qchild_frame_border_width, parms)))
{
Lisp_Object value;
value = gui_display_get_arg (dpyinfo, parms, Qchild_frame_border_width,
"childFrameBorderWidth", "childFrameBorderWidth",
"childFrameBorder", "childFrameBorder",
RES_TYPE_NUMBER);
if (! EQ (value, Qunbound))
parms = Fcons (Fcons (Qchild_frame_border_width, value),
@ -1486,10 +1488,6 @@ This function is an internal primitive--use `make-frame' instead. */ )
make_fixnum (0),
"childFrameBorderWidth", "childFrameBorderWidth",
RES_TYPE_NUMBER);
gui_default_parameter (f, parms, Qinternal_border_width,
make_fixnum (0),
"internalBorderWidth", "internalBorderWidth",
RES_TYPE_NUMBER);
gui_default_parameter (f, parms, Qright_divider_width, make_fixnum (0),
NULL, NULL, RES_TYPE_NUMBER);
gui_default_parameter (f, parms, Qbottom_divider_width, make_fixnum (0),

3
src/pgtkterm.c
View file

@ -4957,7 +4957,8 @@ void
pgtk_clear_under_internal_border (struct frame *f)
{
if (FRAME_INTERNAL_BORDER_WIDTH (f) > 0
&& gtk_widget_get_realized (FRAME_GTK_OUTER_WIDGET (f)))
&& (!FRAME_GTK_OUTER_WIDGET (f)
|| gtk_widget_get_realized (FRAME_GTK_OUTER_WIDGET (f))))
{
int border = FRAME_INTERNAL_BORDER_WIDTH (f);
int width = FRAME_PIXEL_WIDTH (f);