comparison src/window.c @ 215:1f0dabaa0855 r20-4b6

Import from CVS: tag r20-4b6
author cvs
date Mon, 13 Aug 2007 10:07:35 +0200
parents 78478c60bfcd
children d44af0c54775
comparison
equal deleted inserted replaced
214:c5d88c05e1e9 215:1f0dabaa0855
2924 } 2924 }
2925 } 2925 }
2926 else if (!NILP (major_kid)) 2926 else if (!NILP (major_kid))
2927 { 2927 {
2928 int last_pos, last_old_pos, pos, old_pos, first; 2928 int last_pos, last_old_pos, pos, old_pos, first;
2929 int pixel_adj_left = new_pixsize - old_pixsize;
2929 int div_val = old_pixsize << 1; 2930 int div_val = old_pixsize << 1;
2930 2931
2931 /* 2932 /*
2932 * Previously we bailed out here if there was no size change. 2933 * Previously we bailed out here if there was no size change.
2933 * But this broke toolbar updates. If a toolbar appears or 2934 * (pixel_adj_left == 0) But this broke toolbar updates. If a
2934 * disappears, windows may not change size, but their top and 2935 * toolbar appears or disappears, windows may not change size,
2935 * left coordinates need to be updated. 2936 * but their top and left coordinates need to be updated.
2936 * 2937 *
2937 * if (!pixel_adj_left) 2938 * So we don't bail until after the loop below.
2938 * return;
2939 */ 2939 */
2940 2940
2941 last_pos = first = (set_height ? WINDOW_TOP (w) : WINDOW_LEFT (w)); 2941 last_pos = first = (set_height ? WINDOW_TOP (w) : WINDOW_LEFT (w));
2942 last_old_pos = 0; 2942 last_old_pos = 0;
2943 2943
2966 set_window_pixsize (child, pos + first - last_pos, 1, set_height); 2966 set_window_pixsize (child, pos + first - last_pos, 1, set_height);
2967 2967
2968 last_pos = pos + first; 2968 last_pos = pos + first;
2969 last_old_pos = old_pos; 2969 last_old_pos = old_pos;
2970 } 2970 }
2971
2972 /* Sometimes we may get called with our old size. In that case
2973 we don't need to do anything else. */
2974 if (!pixel_adj_left)
2975 return;
2971 2976
2972 /* Now delete any children that became too small. */ 2977 /* Now delete any children that became too small. */
2973 if (!nodelete) 2978 if (!nodelete)
2974 for (child = major_kid; !NILP (child); child = XWINDOW (child)->next) 2979 for (child = major_kid; !NILP (child); child = XWINDOW (child)->next)
2975 { 2980 {