comparison src/window.c @ 32928:859adc7ac97d

(size_window): Compute size difference from sum of old child window sizes instead of from parent's size.

32927:c0b62376988c

  /* If the window has been "too small" at one point,
     don't delete it for being "too small" in the future.
     Preserve it as long as that is at all possible.  */
  if (width_p)
    {
      old_size = XFASTINT (w->width);
      min_size = window_min_width;
    }
  else
    {
      old_size = XFASTINT (w->height);
      min_size = window_min_height;
    }
  
  if (old_size < window_min_width)
    w->too_small_ok = Qt;

    }
  else if (!NILP (*forward))
    {
      int fixed_size, each, extra, n;
      int resize_fixed_p, nfixed;
      int last_pos, first_pos, nchildren;

      /* Determine the fixed-size portion of the this window, and the
	 number of child windows.  */
      fixed_size = nchildren = nfixed = 0;
      for (child = *forward; !NILP (child); child = c->next, ++nchildren)
	{
	  c = XWINDOW (child);
	  if (window_fixed_size_p (c, width_p, 0))
	    {
	      fixed_size += (width_p
			     ? XFASTINT (c->width) : XFASTINT (c->height));
	      ++nfixed;
	    }
	}

      /* If the new size is smaller than fixed_size, or if there

      resize_fixed_p = nfixed == nchildren || size < fixed_size;

      /* Compute how many lines/columns to add to each child.  The
	 value of extra takes care of rounding errors.  */
      n = resize_fixed_p ? nchildren : nchildren - nfixed;
      each = (size - old_size) / n;
      extra = (size - old_size) - n * each;

      /* Compute new children heights and edge positions.  */
      first_pos = width_p ? XFASTINT (w->left) : XFASTINT (w->top);
      last_pos = first_pos;
      for (child = *forward; !NILP (child); child = c->next)
	{
	  int new_size, old_size;
	  

      if (!nodelete_p)
	for (child = *forward; !NILP (child); child = c->next)
	  {
	    int child_size;
	    c = XWINDOW (child);
	    child_size = width_p ? XFASTINT (c->width) : XFASTINT (c->height);
	    size_window (child, child_size, width_p, 0);
	  }
    }
}

32928:859adc7ac97d

  /* If the window has been "too small" at one point,
     don't delete it for being "too small" in the future.
     Preserve it as long as that is at all possible.  */
  if (width_p)
    {
      old_size = XINT (w->width);
      min_size = window_min_width;
    }
  else
    {
      old_size = XINT (w->height);
      min_size = window_min_height;
    }
  
  if (old_size < window_min_width)
    w->too_small_ok = Qt;

    }
  else if (!NILP (*forward))
    {
      int fixed_size, each, extra, n;
      int resize_fixed_p, nfixed;
      int last_pos, first_pos, nchildren, total;

      /* Determine the fixed-size portion of the this window, and the
	 number of child windows.  */
      fixed_size = nchildren = nfixed = total = 0;
      for (child = *forward; !NILP (child); child = c->next, ++nchildren)
	{
	  int child_size;
	  
	  c = XWINDOW (child);
	  child_size = width_p ? XINT (c->width) : XINT (c->height);
	  total += child_size;
	  
	  if (window_fixed_size_p (c, width_p, 0))
	    {
	      fixed_size += child_size;
	      ++nfixed;
	    }
	}

      /* If the new size is smaller than fixed_size, or if there

      resize_fixed_p = nfixed == nchildren || size < fixed_size;

      /* Compute how many lines/columns to add to each child.  The
	 value of extra takes care of rounding errors.  */
      n = resize_fixed_p ? nchildren : nchildren - nfixed;
      each = (size - total) / n;
      extra = (size - total) - n * each;

      /* Compute new children heights and edge positions.  */
      first_pos = width_p ? XINT (w->left) : XINT (w->top);
      last_pos = first_pos;
      for (child = *forward; !NILP (child); child = c->next)
	{
	  int new_size, old_size;
	  

      if (!nodelete_p)
	for (child = *forward; !NILP (child); child = c->next)
	  {
	    int child_size;
	    c = XWINDOW (child);
	    child_size = width_p ? XINT (c->width) : XINT (c->height);
	    size_window (child, child_size, width_p, 0);
	  }
    }
}