diff options
| author | Martin Rudalics | 2013-12-03 12:33:13 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2013-12-03 12:33:13 +0100 |
| commit | 4525072b215933d69e409dfe8c2aaa73dc9f2bb9 (patch) | |
| tree | 410a7fc801384d9f6142eb0ba7dca798e21a140d /src/xterm.c | |
| parent | d6f2380eeed330976812f3d53849640ea77cd064 (diff) | |
| download | emacs-4525072b215933d69e409dfe8c2aaa73dc9f2bb9.tar.gz emacs-4525072b215933d69e409dfe8c2aaa73dc9f2bb9.zip | |
Fix last fix (Bug#16036)
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/xterm.c b/src/xterm.c index 60db9e107fe..a77279849d3 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -8638,20 +8638,18 @@ x_set_window_size (struct frame *f, int change_gravity, int width, int height, b | |||
| 8638 | change_frame_size (f, text_width, text_height, 0, 1, 0, 1); | 8638 | change_frame_size (f, text_width, text_height, 0, 1, 0, 1); |
| 8639 | } | 8639 | } |
| 8640 | 8640 | ||
| 8641 | if (! pixelwise) | ||
| 8642 | { | ||
| 8643 | width = width * FRAME_COLUMN_WIDTH (f); | ||
| 8644 | height = height * FRAME_LINE_HEIGHT (f); | ||
| 8645 | } | ||
| 8646 | |||
| 8647 | #ifdef USE_GTK | 8641 | #ifdef USE_GTK |
| 8648 | if (FRAME_GTK_WIDGET (f)) | 8642 | if (FRAME_GTK_WIDGET (f)) |
| 8649 | xg_frame_set_char_size (f, width, height); | 8643 | if (! pixelwise) |
| 8644 | xg_frame_set_char_size (f, width * FRAME_COLUMN_WIDTH (f), | ||
| 8645 | height * FRAME_LINE_HEIGHT (f)); | ||
| 8646 | else | ||
| 8647 | xg_frame_set_char_size (f, width, height); | ||
| 8650 | else | 8648 | else |
| 8651 | x_set_window_size_1 (f, change_gravity, width, height, 1); | 8649 | x_set_window_size_1 (f, change_gravity, width, height, pixelwise); |
| 8652 | #else /* not USE_GTK */ | 8650 | #else /* not USE_GTK */ |
| 8653 | 8651 | ||
| 8654 | x_set_window_size_1 (f, change_gravity, width, height, 1); | 8652 | x_set_window_size_1 (f, change_gravity, width, height, pixelwise); |
| 8655 | 8653 | ||
| 8656 | #endif /* not USE_GTK */ | 8654 | #endif /* not USE_GTK */ |
| 8657 | 8655 | ||