diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2014-09-09 19:46:28 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2014-09-09 19:46:28 +0200 |
| commit | b0fb34364bede539a904fb89c8adc8830ee8c652 (patch) | |
| tree | 934e992decec38e17d8b7f6256a2c6cfe0abe338 | |
| parent | 1acb1beff16b4df3512f0fe59850ed4541d038c3 (diff) | |
| download | emacs-b0fb34364bede539a904fb89c8adc8830ee8c652.tar.gz | |
* nsterm.m (updateFrameSize:, initFrameFromEmacs:)
(toggleFullScreen:): Take frame_resize_pixelwise into account when
setting resize increments.
Fixes: debbugs:18435
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/nsterm.m | 17 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 274817d8262..fc1f1af853b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-09-09 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (updateFrameSize:, initFrameFromEmacs:) + (toggleFullScreen:): Take frame_resize_pixelwise into account when + setting resize increments (Bug#18435). + 2014-09-09 Eli Zaretskii <eliz@gnu.org> * xdisp.c (pos_visible_p): Properly save and restore the iterator diff --git a/src/nsterm.m b/src/nsterm.m index 4b1ebb2b516..833b8e389a9 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5821,10 +5821,13 @@ not_in_argv (NSString *arg) // Did resize increments change because of a font change? if (sz.width != FRAME_COLUMN_WIDTH (emacsframe) || - sz.height != FRAME_LINE_HEIGHT (emacsframe)) + sz.height != FRAME_LINE_HEIGHT (emacsframe) || + (frame_resize_pixelwise && sz.width != 1)) { - sz.width = FRAME_COLUMN_WIDTH (emacsframe); - sz.height = FRAME_LINE_HEIGHT (emacsframe); + sz.width = frame_resize_pixelwise + ? 1 : FRAME_COLUMN_WIDTH (emacsframe); + sz.height = frame_resize_pixelwise + ? 1 : FRAME_LINE_HEIGHT (emacsframe); [win setResizeIncrements: sz]; NSTRACE_SIZE ("New size", NSMakeSize (neww, newh)); @@ -6086,8 +6089,8 @@ if (cols > 0 && rows > 0) [win setDelegate: self]; [win useOptimizedDrawing: YES]; - sz.width = FRAME_COLUMN_WIDTH (f); - sz.height = FRAME_LINE_HEIGHT (f); + sz.width = frame_resize_pixelwise ? 1 : FRAME_COLUMN_WIDTH (f); + sz.height = frame_resize_pixelwise ? 1 : FRAME_LINE_HEIGHT (f); [win setResizeIncrements: sz]; [[win contentView] addSubview: self]; @@ -6434,8 +6437,8 @@ if (cols > 0 && rows > 0) (FRAME_DEFAULT_FACE (f)), f); - sz.width = FRAME_COLUMN_WIDTH (f); - sz.height = FRAME_LINE_HEIGHT (f); + sz.width = frame_resize_pixelwise ? 1 : FRAME_COLUMN_WIDTH (f); + sz.height = frame_resize_pixelwise ? 1 : FRAME_LINE_HEIGHT (f); if (fs_state != FULLSCREEN_BOTH) { |