diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 10:45:31 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-07-06 10:45:31 +0100 |
commit | 0f151e37cba454fcb863b6b38e1780f2b04be903 (patch) | |
tree | 5b0f84879eb2896158c4f3c4f82c0391c8ec3380 /windows | |
parent | f5c62c2291add5e6e3b8fc604831283e4883a3c6 (diff) | |
parent | 18aefabd20a16dda9ed5363088f0da5ada0d4431 (diff) | |
download | netsurf-0f151e37cba454fcb863b6b38e1780f2b04be903.tar.gz netsurf-0f151e37cba454fcb863b6b38e1780f2b04be903.tar.bz2 |
Merge branch 'vince/reformatpending'
Conflicts:
amiga/gui.c
Diffstat (limited to 'windows')
-rw-r--r-- | windows/gui.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/windows/gui.c b/windows/gui.c index 824abade7..19a31c1be 100644 --- a/windows/gui.c +++ b/windows/gui.c @@ -93,7 +93,6 @@ static void nsws_set_scale(struct gui_window *gw, float scale) return; browser_window_set_scale(gw->bw, scale, true); - browser_window_reformat(gw->bw, false, gw->width, gw->height); } @@ -1821,6 +1820,16 @@ nsws_create_main_class(HINSTANCE hinstance) { } /** + * callback from core to reformat a window. + */ +static void win32_window_reformat(struct gui_window *gw) +{ + if (gw != NULL) { + browser_window_reformat(gw->bw, false, gw->width, gw->height); + } +} + +/** * Generate a windows path from one or more component elemnts. * * If a string is allocated it must be freed by the caller. @@ -2087,6 +2096,7 @@ static struct gui_window_table window_table = { .set_scroll = gui_window_set_scroll, .get_dimensions = gui_window_get_dimensions, .update_extent = gui_window_update_extent, + .reformat = win32_window_reformat, .set_title = gui_window_set_title, .set_url = gui_window_set_url, |