comparison src/nsterm.m @ 102427:03f8a267cd56

* nsterm.m (x_set_window_size): Change back to calculated method of setting toolbar height under Cocoa. (Bug#2546) (EmacsView-windowWillUseStandardFrame:defaultFrame:): New method. (EmacsView-drawRect:): Completely shortcircuit if ns_in_resize.

102426:99e14dddbf65

  compute_fringe_widths (f, 0);

  pixelwidth =  FRAME_TEXT_COLS_TO_PIXEL_WIDTH   (f, cols);
  pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);

  /* If we have a change in toolbar display, calculate height */
  if (tb)
    /* XXX: GNUstep has not yet implemented the first method below, added
           in Panther, however the second is incorrect under Cocoa. */
#ifdef NS_IMPL_GNUSTEP
    FRAME_NS_TOOLBAR_HEIGHT (f)
      = NSHeight ([NSWindow frameRectForContentRect: NSMakeRect (0, 0, 0, 0)
			    styleMask: [window styleMask]])
        - FRAME_NS_TITLEBAR_HEIGHT (f);
#else
    FRAME_NS_TOOLBAR_HEIGHT (f) = 32;
      /* actually get wrong result here if toolbar not yet displayed
         NSHeight ([window frameRectForContentRect: NSMakeRect (0, 0, 0, 0)])
         - FRAME_NS_TITLEBAR_HEIGHT (f); */
#endif
  else
    FRAME_NS_TOOLBAR_HEIGHT (f) = 0;

  wr.size.width = pixelwidth + f->border_width;
  wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f) 

#ifdef NS_IMPL_COCOA
/* if we don't do this manually, the window will resize but not move */
- (BOOL)windowShouldZoom: (NSWindow *)sender toFrame: (NSRect)newFrame
{
  [[self window] setFrame: newFrame display: NO];
  return YES;
}
#endif

/* Implement this to control size of frame on zoom.
- (NSRect)windowWillUseStandardFrame:(NSWindow *)sender
                        defaultFrame:(NSRect)defaultFrame; */


- (void)windowDidDeminiaturize: sender
{
  NSTRACE (windowDidDeminiaturize);

  int x = NSMinX (rect), y = NSMinY (rect);
  int width = NSWidth (rect), height = NSHeight (rect);

  NSTRACE (drawRect);

  if (!emacsframe || !emacsframe->output_data.ns)
    return;

  if (!ns_in_resize)
    ns_clear_frame_area (emacsframe, x, y, width, height);
  expose_frame (emacsframe, x, y, width, height);

  emacsframe->async_visible = 1;
  emacsframe->async_iconified = 0;

/*    SET_FRAME_GARBAGED (emacsframe);
      ns_send_appdefined (-1); */
}


/* NSDraggingDestination protocol methods.  Actually this is not really a
   protocol, but a category of Object.  O well...  */

102427:03f8a267cd56

  compute_fringe_widths (f, 0);

  pixelwidth =  FRAME_TEXT_COLS_TO_PIXEL_WIDTH   (f, cols);
  pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows);

  /* If we have a toolbar, take its height into account. */
  /* XXX: GNUstep has not yet implemented the first method below, added
          in Panther, however the second is incorrect under Cocoa. */
  if (tb)
    FRAME_NS_TOOLBAR_HEIGHT (f) =
#ifdef NS_IMPL_COCOA
      NSHeight ([window frameRectForContentRect: NSMakeRect (0, 0, 0, 0)])
      /* NOTE: previously this would generate wrong result if toolbar not
               yet displayed and fixing toolbar_height=32 helped, but
               now (200903) seems no longer needed */
#else
      NSHeight ([NSWindow frameRectForContentRect: NSMakeRect (0, 0, 0, 0)
					styleMask: [window styleMask]])
#endif
            - FRAME_NS_TITLEBAR_HEIGHT (f);
  else
    FRAME_NS_TOOLBAR_HEIGHT (f) = 0;

  wr.size.width = pixelwidth + f->border_width;
  wr.size.height = pixelheight + FRAME_NS_TITLEBAR_HEIGHT (f) 

#ifdef NS_IMPL_COCOA
/* if we don't do this manually, the window will resize but not move */
- (BOOL)windowShouldZoom: (NSWindow *)sender toFrame: (NSRect)newFrame
{
  NSTRACE (windowShouldZoom);
  [[self window] setFrame: newFrame display: NO];
  return YES;
}
#endif


/* Override to do something slightly nonstandard, but nice.  First click on
   zoom button will zoom vertically.  Second will zoom completely.  Third
   returns to original. */
- (NSRect)windowWillUseStandardFrame:(NSWindow *)sender
                        defaultFrame:(NSRect)defaultFrame
{
  NSRect result = [sender frame];
  NSTRACE (windowWillUseStandardFrame);

  if (result.size.height == defaultFrame.size.height) {
    result = defaultFrame;
  } else {
    result.size.height = defaultFrame.size.height;
    result.origin.y = defaultFrame.origin.y;
  }

  /* A windowWillResize does not get generated at least on Tiger. */
  [self windowWillResize: sender toSize: result.size];
  return result;
}


- (void)windowDidDeminiaturize: sender
{
  NSTRACE (windowDidDeminiaturize);

  int x = NSMinX (rect), y = NSMinY (rect);
  int width = NSWidth (rect), height = NSHeight (rect);

  NSTRACE (drawRect);

  if (!emacsframe || !emacsframe->output_data.ns || ns_in_resize)
    return;

  ns_clear_frame_area (emacsframe, x, y, width, height);
  expose_frame (emacsframe, x, y, width, height);
  emacsframe->async_visible = 1;
  emacsframe->async_iconified = 0;
}


/* NSDraggingDestination protocol methods.  Actually this is not really a
   protocol, but a category of Object.  O well...  */