summaryrefslogtreecommitdiff
path: root/src/frame.h
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2010-04-07 18:34:31 +0200
committerJan Djärv <jan.h.d@swipnet.se>2010-04-07 18:34:31 +0200
commitf016f225d26e074eba8b7720a1f76574bee21d30 (patch)
tree31223c5eb2dc3024895281af20911646c20468a9 /src/frame.h
parent64e692b56e84153d45b2c46d833dce14243f7c69 (diff)
downloademacs-f016f225d26e074eba8b7720a1f76574bee21d30.tar.gz
Fix resizing for X and non-Gtk+ build. Bug #5848.
* frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use FRAME_LINE_TO_PIXEL_Y. * xterm.c (x_set_window_size_1): Don't add border_width/height to pixelwidth/height.
Diffstat (limited to 'src/frame.h')
-rw-r--r--src/frame.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frame.h b/src/frame.h
index 58c59954f15..36b0b6b069c 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -997,8 +997,8 @@ extern Lisp_Object selected_frame;
+ FRAME_INTERNAL_BORDER_WIDTH (f))
#define FRAME_TEXT_LINES_TO_PIXEL_HEIGHT(f, lines) \
- (FRAME_LINE_TO_PIXEL_Y (f, lines) \
- + FRAME_INTERNAL_BORDER_WIDTH (f))
+ ((lines) * FRAME_LINE_HEIGHT (f) \
+ + 2 * FRAME_INTERNAL_BORDER_WIDTH (f))
/* Return the row/column (zero-based) of the character cell containing