(update_from_various_frame_slots)

(update_various_frame_slots): Take account of menubar_height.

diff --git a/src/widget.c b/src/widget.c
index c2c6beaec6b1065f3b6a127193245b23a69ebddc..650dd583de74cde2494a7b37fd64156fa5cec4ed 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -642,7 +642,7 @@ update_various_frame_slots (ew)
      EmacsFrame ew;
 {
   struct x_output *x = ew->emacs_frame.frame->output_data.x;
-  x->pixel_height = ew->core.height;
+  x->pixel_height = ew->core.height + x->menubar_height;
   x->pixel_width = ew->core.width;
   x->internal_border_width = ew->emacs_frame.internal_border_width;
 
@@ -653,7 +653,7 @@ update_from_various_frame_slots (ew)
      EmacsFrame ew;
 {
   struct x_output *x = ew->emacs_frame.frame->output_data.x;
-  ew->core.height = x->pixel_height;
+  ew->core.height = x->pixel_height - x->menubar_height;
   ew->core.width = x->pixel_width;
   ew->core.background_pixel = x->background_pixel;
   ew->emacs_frame.internal_border_width = x->internal_border_width;