From 18aefabd20a16dda9ed5363088f0da5ada0d4431 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Mon, 30 Jun 2014 16:40:56 +0100
Subject: change reformat to be driven from the scheduler like redraw

---
 amiga/gui.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'amiga')

diff --git a/amiga/gui.c b/amiga/gui.c
index 6b02cac4f..bc01ff99e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2128,12 +2128,11 @@ void ami_handle_msg(void)
 									GetClickTabNodeAttrs(tab,
 										TNA_UserData, &bw,
 										TAG_DONE);
-									bw->reformat_pending = true;
 								} while(tab=ntab);
 							}
 
 							refresh_favicon = TRUE;
-							gwin->bw->reformat_pending = true;
+							browser_window_schedule_reformat(gwin->bw);
 							ami_schedule_redraw(gwin, true);
 						break;
 					}
@@ -2204,11 +2203,6 @@ void ami_handle_msg(void)
 
 		if(node->Type == AMINS_WINDOW)
 		{
-			/* Catch any reformats tagged by the core - only used by scale? */
-			if(gwin->bw->reformat_pending) {
-				ami_schedule_redraw(gwin, true);
-			}
-			
 			if(gwin->bw->window->throbbing)
 				ami_update_throbber(gwin,false);
 		}
@@ -2950,7 +2944,6 @@ void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
 				gwin->win, NULL, TRUE);
 		
 		if(gwin->bw) {
-			gwin->bw->reformat_pending = true;
 			ami_schedule_redraw(gwin, true);
 		}
 	}
@@ -2992,7 +2985,6 @@ void ami_gui_hotlist_toolbar_remove(struct gui_window_2 *gwin)
 	RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN],
 			gwin->win, NULL, TRUE);
 
-	gwin->bw->reformat_pending = true;
 	ami_schedule_redraw(gwin, true);
 }
 
@@ -3105,7 +3097,6 @@ void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
 			gwin->win, NULL, TRUE);
 
 	if(gwin->bw) {
-		gwin->bw->reformat_pending = true;
 		ami_schedule_redraw(gwin, true);
 	}
 }
@@ -4031,7 +4022,7 @@ static void ami_redraw_callback(void *p)
 {
 	struct gui_window_2 *gwin = (struct gui_window_2 *)p;
 
-	if(gwin->redraw_required || gwin->bw->reformat_pending) {
+	if(gwin->redraw_required) {
 		ami_do_redraw(gwin);
 	}
 
@@ -4060,7 +4051,6 @@ void ami_schedule_redraw(struct gui_window_2 *gwin, bool full_redraw)
 	if(full_redraw) gwin->redraw_required = true;
 	if(gwin->redraw_scheduled == true) return;
 
-	if(gwin->bw->reformat_pending) ms = nsoption_int(reformat_delay) * 10;
 	ami_schedule(ms, ami_redraw_callback, gwin);
 	gwin->redraw_scheduled = true;
 }
@@ -4291,6 +4281,21 @@ static void gui_window_update_box(struct gui_window *g, const struct rect *rect)
 	ami_schedule_redraw(g->shared, false);
 }
 
+/**
+ * callback from core to reformat a window.
+ */
+static void amiga_window_reformat(struct gui_window *gw)
+{
+	struct IBox *bbox;
+
+	if (gw != NULL) {
+		GetAttr(SPACE_AreaBox, (Object *)gw->shared->objects[GID_BROWSER], (ULONG *)&bbox);
+		browser_window_reformat(gw->shared->bw, false, bbox->Width, bbox->Height);
+
+		gw->shared->redraw_scroll = false;
+	}
+}
+
 static void ami_do_redraw(struct gui_window_2 *gwin)
 {
 	struct Rectangle rect;
@@ -4313,13 +4318,6 @@ static void ami_do_redraw(struct gui_window_2 *gwin)
 	xoffset=bbox->Left;
 	yoffset=bbox->Top;
 
-	if(gwin->bw->reformat_pending)
-	{
-		browser_window_reformat(gwin->bw, false, width, height);
-		gwin->bw->reformat_pending = false;
-		gwin->redraw_scroll = false;
-	}
-
 	if(gwin->redraw_scroll)
 	{
 		if((abs(vcurrent-oldv) > height) ||	(abs(hcurrent-oldh) > width))
@@ -5060,6 +5058,7 @@ static struct gui_window_table amiga_window_table = {
 	.set_scroll = gui_window_set_scroll,
 	.get_dimensions = gui_window_get_dimensions,
 	.update_extent = gui_window_update_extent,
+	.reformat = amiga_window_reformat,
 
 	.set_icon = gui_window_set_icon,
 	.set_title = gui_window_set_title,
-- 
cgit v1.2.3