From c4829ca6363048f45ead7f946fedb33cdaeccd11 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 25 Oct 2014 15:43:41 +0100 Subject: Initial bw scale comes from core. --- atari/gui.h | 9 +++++---- atari/rootwin.c | 5 +---- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'atari') diff --git a/atari/gui.h b/atari/gui.h index 3265759ec..68a416e0f 100755 --- a/atari/gui.h +++ b/atari/gui.h @@ -91,7 +91,7 @@ struct s_focus_info #define CDT_ICON 0x04UL #define CDT_ICON_TYPE 0x05UL # define CDT_ICON_TYPE_NONE 0x00UL -# define CDT_ICON_TYPE_OBJECT 0x01UL +# define CDT_ICON_TYPE_OBJECT 0x01UL # define CDT_ICON_TYPE_BITMAP 0x02UL @@ -127,9 +127,9 @@ struct s_gui_win_root }; typedef struct s_gui_win_root ROOTWIN; -struct s_browser -{ - struct browser_window * bw; +struct s_browser +{ + struct browser_window * bw; bool attached; }; @@ -147,6 +147,7 @@ struct gui_window { char * status; char * title; char * url; + float scale; struct bitmap * icon; struct s_caret caret; struct s_search_form_session *search; diff --git a/atari/rootwin.c b/atari/rootwin.c index 3ef150b6c..48ea5f340 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -286,10 +286,7 @@ int window_create(struct gui_window * gw, assert(gw->browser); gw->browser->bw = bw; - if(existing) - gw->browser->bw->scale = existing->browser->bw->scale; - else - gw->browser->bw->scale = 1; + gw->scale = browser_window_get_scale(bw); /* create statusbar component: */ -- cgit v1.2.3