summaryrefslogtreecommitdiff
path: root/atari
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2014-07-06 10:45:31 +0100
committerVincent Sanders <vince@kyllikki.org>2014-07-06 10:45:31 +0100
commit0f151e37cba454fcb863b6b38e1780f2b04be903 (patch)
tree5b0f84879eb2896158c4f3c4f82c0391c8ec3380 /atari
parentf5c62c2291add5e6e3b8fc604831283e4883a3c6 (diff)
parent18aefabd20a16dda9ed5363088f0da5ada0d4431 (diff)
downloadnetsurf-0f151e37cba454fcb863b6b38e1780f2b04be903.tar.gz
netsurf-0f151e37cba454fcb863b6b38e1780f2b04be903.tar.bz2
Merge branch 'vince/reformatpending'
Conflicts: amiga/gui.c
Diffstat (limited to 'atari')
-rw-r--r--atari/deskmenu.c8
-rw-r--r--atari/gui.c21
-rwxr-xr-xatari/gui.h3
-rwxr-xr-xatari/rootwin.c2
4 files changed, 14 insertions, 20 deletions
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;