From 3e24dc831bc18d50ee565a3fc488f57956d498ed Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 26 Apr 2017 09:55:36 +0100 Subject: update windows frontend to remove reformat --- frontends/windows/window.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) (limited to 'frontends') diff --git a/frontends/windows/window.c b/frontends/windows/window.c index c0af46f8f..829067b32 100644 --- a/frontends/windows/window.c +++ b/frontends/windows/window.c @@ -1236,7 +1236,7 @@ nsws_window_command(HWND hwnd, browser_window_debug(gw->bw, CONTENT_DEBUG_REDRAW); /* TODO: This should only redraw, not reformat. * (Layout doesn't change, so reformat is a waste of time) */ - browser_window_reformat(gw->bw, false, gw->width, gw->height); + browser_window_schedule_reformat(gw->bw); } break; @@ -1548,18 +1548,17 @@ static void win32_window_destroy(struct gui_window *w) * \param height receives height of window * \param scaled whether to return scaled values */ -static void +static nserror win32_window_get_dimensions(struct gui_window *gw, int *width, int *height, bool scaled) { - if (gw == NULL) - return; - - LOG("get dimensions %p w=%d h=%d", gw, gw->width, gw->height); - *width = gw->width; *height = gw->height; + + LOG("gw:%p w=%d h=%d", gw, *width, *height); + + return NSERROR_OK; } @@ -1575,19 +1574,6 @@ static void win32_window_update_extent(struct gui_window *w) } -/** - * callback from core to reformat a win32 window. - * - * \param gw The win32 gui window to reformat. - */ -static void win32_window_reformat(struct gui_window *gw) -{ - if (gw != NULL) { - browser_window_reformat(gw->bw, false, gw->width, gw->height); - } -} - - /** * set win32 browser window title * @@ -1773,7 +1759,6 @@ static struct gui_window_table window_table = { .set_scroll = win32_window_set_scroll, .get_dimensions = win32_window_get_dimensions, .update_extent = win32_window_update_extent, - .reformat = win32_window_reformat, .set_title = win32_window_set_title, .set_url = win32_window_set_url, -- cgit v1.2.3