diff options
author | Sven Weidauer <sven@5sw.de> | 2017-08-12 12:58:38 +0200 |
---|---|---|
committer | Sven Weidauer <sven@5sw.de> | 2017-08-12 12:58:38 +0200 |
commit | d0549e7a5b14959097a1e8696dce1b1f40c6ba54 (patch) | |
tree | 9cb65c8a82a3a08f1c360a07287372febbad2878 /frontends/windows | |
parent | b9b91d4117e500d6da6b68d505d99c34e92c1fd1 (diff) | |
parent | 8c29c675c4301c90f5038a27aa31fa640f47e5aa (diff) | |
download | netsurf-d0549e7a5b14959097a1e8696dce1b1f40c6ba54.tar.gz netsurf-d0549e7a5b14959097a1e8696dce1b1f40c6ba54.tar.bz2 |
Merge remote-tracking branch 'origin/master' into svenw/cocoa
Diffstat (limited to 'frontends/windows')
-rw-r--r-- | frontends/windows/font.c | 2 | ||||
-rw-r--r-- | frontends/windows/window.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/frontends/windows/font.c b/frontends/windows/font.c index 3407ec4e0..75464f992 100644 --- a/frontends/windows/font.c +++ b/frontends/windows/font.c @@ -280,7 +280,7 @@ win32_font_split(const plot_font_style_t *style, length, x, char_offset, - actual_x)) { + actual_x) == NSERROR_OK) { c_off = *char_offset; if (*char_offset == length) { ret = NSERROR_OK; diff --git a/frontends/windows/window.c b/frontends/windows/window.c index 976974cfa..c72173697 100644 --- a/frontends/windows/window.c +++ b/frontends/windows/window.c @@ -1339,7 +1339,6 @@ nsws_window_resize(struct gui_window *gw, WPARAM wparam, LPARAM lparam) { - struct rect rect; RECT rstatus, rtool; if ((gw->toolbar == NULL) || @@ -1352,7 +1351,6 @@ nsws_window_resize(struct gui_window *gw, GetClientRect(gw->toolbar, &rtool); GetWindowRect(gw->statusbar, &rstatus); - win32_window_get_scroll(gw, &rect.x0, &rect.y0); gw->width = LOWORD(lparam); gw->height = HIWORD(lparam) - (rtool.bottom - rtool.top) - (rstatus.bottom - rstatus.top); @@ -1366,7 +1364,7 @@ nsws_window_resize(struct gui_window *gw, } nsws_window_update_forward_back(gw); - win32_window_set_scroll(gw, &rect); + browser_window_update(gw->bw, false); if (gw->toolbar != NULL) { SendMessage(gw->toolbar, TB_SETSTATE, |