From 5075d8535904317a9dff2ff3eebbc7540cc587c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Fri, 8 Jan 2010 12:41:57 +0100 Subject: [PATCH] Frame width was not updated in fullscreen when scroll bars where removed/added. (change_frame_size_1): newwidth == FRAME_COLS (f) must also be true before we can return early (bug #5339). --- src/ChangeLog | 5 +++++ src/dispnew.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index b7ecf6b7297..fd32d739bc0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-01-08 Jan Djärv + + * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS (f) must + also be true before we can return early (bug #5339). + 2010-01-06 David Reitter * nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS. diff --git a/src/dispnew.c b/src/dispnew.c index 0039ec0d181..3ed5469c063 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6340,8 +6340,11 @@ change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe) check_frame_size (f, &newheight, &newwidth); /* If we're not changing the frame size, quit now. */ + /* Frame width may be unchanged but the text portion may change, for example, + fullscreen and remove/add scroll bar. */ if (newheight == FRAME_LINES (f) - && new_frame_total_cols == FRAME_TOTAL_COLS (f)) + && newwidth == FRAME_COLS (f) // text portion unchanged + && new_frame_total_cols == FRAME_TOTAL_COLS (f)) // frame width unchanged return; BLOCK_INPUT; -- 2.39.2