mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-28 08:11:05 -08:00
(EmacsFrameSetValues): Copy internal_border_width
from the Emacs frame if caller isn't changing it.
This commit is contained in:
parent
ba88fc3af1
commit
de42d728f6
1 changed files with 11 additions and 0 deletions
11
src/widget.c
11
src/widget.c
|
|
@ -796,6 +796,7 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
|
|||
Boolean has_to_recompute_size;
|
||||
Boolean has_to_recompute_gcs;
|
||||
Boolean has_to_update_hints;
|
||||
Boolean has_to_update_internal_border_width;
|
||||
|
||||
int char_width, char_height;
|
||||
Dimension pixel_width;
|
||||
|
|
@ -814,6 +815,10 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
|
|||
|
||||
has_to_update_hints = (cur->emacs_frame.font != new->emacs_frame.font);
|
||||
|
||||
has_to_update_internal_border_width
|
||||
= (cur->emacs_frame.internal_border_width
|
||||
!= new->emacs_frame.internal_border_width);
|
||||
|
||||
if (has_to_recompute_gcs)
|
||||
{
|
||||
setup_frame_gcs (new);
|
||||
|
|
@ -839,6 +844,12 @@ EmacsFrameSetValues (cur_widget, req_widget, new_widget, dum1, dum2)
|
|||
if (has_to_update_hints)
|
||||
update_wm_hints (new);
|
||||
|
||||
/* Don't clobber the internal_border_width
|
||||
if the caller did not try to change it. */
|
||||
if (! has_to_update_internal_border_width)
|
||||
new->emacs_frame.internal_border_width
|
||||
= new->emacs_frame.frame->output_data.x->internal_border_width;
|
||||
|
||||
update_various_frame_slots (new);
|
||||
|
||||
/* #### This doesn't work, I haven't been able to find ANY kludge that
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue