From: Kim F. Storm <storm@cua.dk>
Date: Sun, 23 Apr 2006 22:28:17 +0000 (+0000)
Subject: (tool_bar_lines_needed): New local `temp_row' for clarity.
X-Git-Tag: emacs-pretest-22.0.90~2975
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=14922abe0328c69c9240b916e5156bf0f02585ee;p=emacs.git

(tool_bar_lines_needed): New local `temp_row' for clarity.
(tool_bar_lines_needed): Clear it when done, so we don't accidentally
draw a second copy of the tool-bar after resetting f->n_tool_bar_rows.
(redisplay_tool_bar): Update tool-bar-lines frame parameter whenever
we recalculate f->n_tool_bar_rows.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f5abe7b37b1..193e5439ebe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,8 +4,8 @@
 	matrices to force recalculation of tool-bar height after font change.
 
 	* xdisp.c (tool_bar_lines_needed): New local `temp_row' for clarity.
-	(tool_bar_lines_needed): Clear it when done, so we don't accidentally
-	draw a second copy of the tool-bar after resetting f->n_tool_bar_rows.
+	Clear it when done, so we don't accidentally draw a second copy of
+	the tool-bar after resetting f->n_tool_bar_rows.
 	(redisplay_tool_bar): Update tool-bar-lines frame parameter whenever
 	we recalculate f->n_tool_bar_rows.
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 5fed86d6d8b..4aa0634e41a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9562,20 +9562,22 @@ tool_bar_lines_needed (f, n_rows)
 {
   struct window *w = XWINDOW (f->tool_bar_window);
   struct it it;
+  struct glyph_row *temp_row = w->desired_matrix->rows;
 
   /* Initialize an iterator for iteration over
      F->desired_tool_bar_string in the tool-bar window of frame F.  */
-  init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID);
+  init_iterator (&it, w, -1, -1, temp_row, TOOL_BAR_FACE_ID);
   it.first_visible_x = 0;
   it.last_visible_x = FRAME_TOTAL_COLS (f) * FRAME_COLUMN_WIDTH (f);
   reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
 
   while (!ITERATOR_AT_END_P (&it))
     {
-      it.glyph_row = w->desired_matrix->rows;
-      clear_glyph_row (it.glyph_row);
+      clear_glyph_row (temp_row);
+      it.glyph_row = temp_row;
       display_tool_bar_line (&it, -1);
     }
+  clear_glyph_row (temp_row);
 
   /* f->n_tool_bar_rows == 0 means "unknown"; -1 means no tool-bar.  */
   if (n_rows)
@@ -9655,7 +9657,29 @@ redisplay_tool_bar (f)
   reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
 
   if (f->n_tool_bar_rows == 0)
-    (void)tool_bar_lines_needed (f, &f->n_tool_bar_rows);
+    {
+      int nlines;
+
+      if ((nlines = tool_bar_lines_needed (f, &f->n_tool_bar_rows),
+	   nlines != WINDOW_TOTAL_LINES (w)))
+	{
+	  extern Lisp_Object Qtool_bar_lines;
+	  Lisp_Object frame;
+	  int old_height = WINDOW_TOTAL_LINES (w);
+
+	  XSETFRAME (frame, f);
+	  clear_glyph_matrix (w->desired_matrix);
+	  Fmodify_frame_parameters (frame,
+				    Fcons (Fcons (Qtool_bar_lines,
+						  make_number (nlines)),
+					   Qnil));
+	  if (WINDOW_TOTAL_LINES (w) != old_height)
+	    {
+	      fonts_changed_p = 1;
+	      return 1;
+	    }
+	}
+    }
 
   /* Display as many lines as needed to display all tool-bar items.  */