Mercurial > emacs

comparison src/widget.c @ 14825:1c8e58bf36fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(update_from_various_frame_slots) (update_various_frame_slots): Take account of menubar_height.
author Richard M. Stallman <rms@gnu.org>
date Sun, 17 Mar 1996 18:09:05 +0000
parents 95dca7f7b4b3
children b906d04998c8
comparison
equal deleted inserted replaced
14824:f56bb68b6903 14825:1c8e58bf36fe
640 static void 640 static void
641 update_various_frame_slots (ew) 641 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
649 } 649 }
650 650
651 static void 651 static void
652 update_from_various_frame_slots (ew) 652 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;
660 ew->emacs_frame.font = x->font; 660 ew->emacs_frame.font = x->font;
661 ew->emacs_frame.foreground_pixel = x->foreground_pixel; 661 ew->emacs_frame.foreground_pixel = x->foreground_pixel;