diff options
| author | Richard M. Stallman | 1996-03-17 18:09:05 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-03-17 18:09:05 +0000 |
| commit | 846dd8ae73d3dd0fa75a5c224f2e57912c32fc21 (patch) | |
| tree | 05738930fcff1828b94d388f94a03a334eac14a9 /src | |
| parent | aa7fcbb0d4fce319323e9039c9ea2040e263d6d0 (diff) | |
| download | emacs-846dd8ae73d3dd0fa75a5c224f2e57912c32fc21.tar.gz emacs-846dd8ae73d3dd0fa75a5c224f2e57912c32fc21.zip | |
(update_from_various_frame_slots)
(update_various_frame_slots): Take account of menubar_height.
Diffstat (limited to 'src')
| -rw-r--r-- | src/widget.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widget.c b/src/widget.c index c2c6beaec6b..650dd583de7 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -642,7 +642,7 @@ update_various_frame_slots (ew) | |||
| 642 | EmacsFrame ew; | 642 | EmacsFrame ew; |
| 643 | { | 643 | { |
| 644 | struct x_output *x = ew->emacs_frame.frame->output_data.x; | 644 | struct x_output *x = ew->emacs_frame.frame->output_data.x; |
| 645 | x->pixel_height = ew->core.height; | 645 | x->pixel_height = ew->core.height + x->menubar_height; |
| 646 | x->pixel_width = ew->core.width; | 646 | x->pixel_width = ew->core.width; |
| 647 | x->internal_border_width = ew->emacs_frame.internal_border_width; | 647 | x->internal_border_width = ew->emacs_frame.internal_border_width; |
| 648 | 648 | ||
| @@ -653,7 +653,7 @@ update_from_various_frame_slots (ew) | |||
| 653 | EmacsFrame ew; | 653 | EmacsFrame ew; |
| 654 | { | 654 | { |
| 655 | struct x_output *x = ew->emacs_frame.frame->output_data.x; | 655 | struct x_output *x = ew->emacs_frame.frame->output_data.x; |
| 656 | ew->core.height = x->pixel_height; | 656 | ew->core.height = x->pixel_height - x->menubar_height; |
| 657 | ew->core.width = x->pixel_width; | 657 | ew->core.width = x->pixel_width; |
| 658 | ew->core.background_pixel = x->background_pixel; | 658 | ew->core.background_pixel = x->background_pixel; |
| 659 | ew->emacs_frame.internal_border_width = x->internal_border_width; | 659 | ew->emacs_frame.internal_border_width = x->internal_border_width; |