Mercurial > emacs

comparison src/widget.c @ 9165:cdbd78e42e03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set_frame_size, EmacsFrameSetCharSize): Use new width formula.
author Karl Heuer <kwzh@gnu.org>
date Wed, 28 Sep 1994 00:58:15 +0000
parents 4a2b3d7c2394
children 786a658d3687
comparison
equal deleted inserted replaced
9164:fbdd7a2e62f4 9165:cdbd78e42e03
421 Dimension pixel_width, pixel_height; 421 Dimension pixel_width, pixel_height;
422 char shell_position [32]; 422 char shell_position [32];
423 423
424 /* Take into account the size of the scrollbar */ 424 /* Take into account the size of the scrollbar */
425 frame->display.x->vertical_scroll_bar_extra 425 frame->display.x->vertical_scroll_bar_extra
426 = (FRAME_HAS_VERTICAL_SCROLL_BARS (frame) 426 = (!FRAME_HAS_VERTICAL_SCROLL_BARS (frame)
427 ? 0
428 : FRAME_SCROLL_BAR_PIXEL_WIDTH (frame) > 0
427 ? FRAME_SCROLL_BAR_PIXEL_WIDTH (frame) 429 ? FRAME_SCROLL_BAR_PIXEL_WIDTH (frame)
428 : 0); 430 : (FRAME_SCROLL_BAR_COLS (frame)
429 431 * FONT_WIDTH (frame->display.x->font)));
430 432
431 change_frame_size (frame, h, w, 1, 0); 433 change_frame_size (frame, h, w, 1, 0);
432 char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height); 434 char_to_pixel_size (ew, w, h, &pixel_width, &pixel_height);
433 ew->core.width = pixel_width; 435 ew->core.width = pixel_width;
434 ew->core.height = pixel_height; 436 ew->core.height = pixel_height;
881 883
882 if (columns < 3) columns = 3; /* no way buddy */ 884 if (columns < 3) columns = 3; /* no way buddy */
883 885
884 check_frame_size (f, &rows, &columns); 886 check_frame_size (f, &rows, &columns);
885 f->display.x->vertical_scroll_bar_extra 887 f->display.x->vertical_scroll_bar_extra
886 = (FRAME_HAS_VERTICAL_SCROLL_BARS (f) 888 = (!FRAME_HAS_VERTICAL_SCROLL_BARS (f)
889 ? 0
890 : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0
887 ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f) 891 ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f)
888 : 0); 892 : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->display.x->font)));
893
889 char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height); 894 char_to_pixel_size (ew, columns, rows, &pixel_width, &pixel_height);
890 895
891 /* Recompute the entire geometry management. */ 896 /* Recompute the entire geometry management. */
892 if (ew->core.width != pixel_width || ew->core.height != pixel_height) 897 if (ew->core.width != pixel_width || ew->core.height != pixel_height)
893 { 898 {