* nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become

zero. Fixes: debbugs:7348

* nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
zero. Fixes: debbugs:7348
9aabf64c · Jan Djärv · 8a6f24e5 · 9aabf64c · 9aabf64c
Commit 9aabf64c authored Feb 08, 2011 by Jan Djärv
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

src/ChangeLog src/ChangeLog +5 -0

src/nsterm.m src/nsterm.m +2 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2011-02-08  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
+	zero (Bug#7348).
+
 2011-02-03  Glenn Morris  <rgm@gnu.org>
  
 	* xfaces.c (Finternal_set_lisp_face_attribute):

--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5721,6 +5721,7 @@ + (CGFloat) scrollerWidth
  win = nwin;
  condemned = NO;
  pixel_height = NSHeight (r);
+  if (pixel_height == 0) pixel_height = 1;
  min_portion = 20 / pixel_height;

  frame = XFRAME (XWINDOW (win)->frame);
@@ -5750,6 +5751,7 @@ - (void)setFrame: (NSRect)newRect
  NSTRACE (EmacsScroller_setFrame);
 /*  BLOCK_INPUT; */
  pixel_height = NSHeight (newRect);
+  if (pixel_height == 0) pixel_height = 1;
  min_portion = 20 / pixel_height;
  [super setFrame: newRect];
  [self display];