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

---
 atari/deskmenu.c |  8 ++++++--
 atari/gui.c      | 21 +++++++--------------
 atari/gui.h      |  3 ---
 atari/rootwin.c  |  2 +-
 4 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'atari')

diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 8de2e327f..53e24a4d4 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -394,7 +394,9 @@ static void __CDECL menu_inc_scale(short item, short title, void *data)
 	if(input_window == NULL)
 		return;
 
-    gui_window_set_scale(input_window, gui_window_get_scale(input_window)+0.25);
+	browser_window_set_scale(input_window->bw,
+		browser_window_get_scale(input_window->bw) + 0.25,
+		true);
 }
 
 
@@ -403,7 +405,9 @@ static void __CDECL menu_dec_scale(short item, short title, void *data)
 	if(input_window == NULL)
 		return;
 
-    gui_window_set_scale(input_window, gui_window_get_scale(input_window)-0.25);
+	browser_window_set_scale(input_window->bw,
+		browser_window_get_scale(input_window->bw) - 0.25,
+		true);
 }
 
 
diff --git a/atari/gui.c b/atari/gui.c
index 608d0d859..efa23efe4 100644
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -201,7 +201,6 @@ gui_window_create(struct browser_window *bw,
             option_window_x, option_window_y,
             option_window_width, option_window_height
         };
-        gui_window_set_scale(gw, 1.0);
         gui_window_set_url(gw, "");
         gui_window_set_pointer(gw, BROWSER_POINTER_DEFAULT);
         gui_set_input_gui_window(gw);
@@ -343,21 +342,14 @@ void gui_window_set_status(struct gui_window *w, const char *text)
         window_set_stauts(w->root, (char*)text);
 }
 
-float gui_window_get_scale(struct gui_window *gw)
+static void atari_window_reformat(struct gui_window *gw)
 {
-    return(gw->scale);
-}
-
-void gui_window_set_scale(struct gui_window *gw, float scale)
-{
-    int width = 0, heigth = 0;
+    int width = 0, height = 0;
 
-	LOG(("scale: %f", scale));
-
-    gw->scale = MAX(scale, 0.25);
-
-	gui_window_get_dimensions(gw, &width, &heigth, true);
- 	browser_window_reformat(gw->browser->bw, false, width, heigth);
+    if (gw != NULL) {
+	gui_window_get_dimensions(gw, &width, &height, true);
+	browser_window_reformat(gw->browser->bw, false, width, height);
+    }
 }
 
 static void gui_window_redraw_window(struct gui_window *gw)
@@ -1017,6 +1009,7 @@ static struct gui_window_table atari_window_table = {
     .set_scroll = gui_window_set_scroll,
     .get_dimensions = gui_window_get_dimensions,
     .update_extent = gui_window_update_extent,
+    .reformat = atari_window_reformat,
 
     .set_title = gui_window_set_title,
     .set_url = gui_window_set_url,
diff --git a/atari/gui.h b/atari/gui.h
index 978c0d093..10736c5f8 100755
--- a/atari/gui.h
+++ b/atari/gui.h
@@ -149,7 +149,6 @@ struct gui_window {
     char * title;
     char * url;
 	struct bitmap * icon;
-	float scale;
 	struct s_caret caret;
 	struct s_search_form_session *search;
 	struct gui_window *next, *prev;
@@ -168,7 +167,5 @@ char *gui_window_get_title(struct gui_window *gw);
 void gui_window_set_status(struct gui_window *w, const char *text);
 void gui_window_set_pointer(struct gui_window *gw, gui_pointer_shape shape);
 void gui_window_destroy(struct gui_window *w);
-void gui_window_set_scale(struct gui_window *gw, float scale);
-float gui_window_get_scale(struct gui_window *gw);
 
 #endif
diff --git a/atari/rootwin.c b/atari/rootwin.c
index fde0bd3b5..7c2cdbcf1 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -834,7 +834,7 @@ static void window_redraw_content(ROOTWIN *rootwin, GRECT *content_area,
 
     plot_set_dimensions(content_area->g_x, content_area->g_y,
                         content_area->g_w, content_area->g_h);
-    oldscale = plot_set_scale(gui_window_get_scale(rootwin->active_gui_window));
+    oldscale = plot_set_scale(browser_window_get_scale(rootwin->active_gui_window->bw));
 
     /* first, we make the coords relative to the content area: */
     content_area_rel.g_x = clip->g_x - content_area->g_x;
-- 
cgit v1.2.3