modules/javafx.graphics/src/main/native-glass/mac/GlassWindow.m

*** 826,851 ****
      GLASS_ASSERT_MAIN_JAVA_THREAD(env);
      GLASS_POOL_ENTER;
      {
          GlassWindow *window = getGlassWindow(env, jPtr);
          window->isEnabled = (BOOL)isEnabled;
- 
-         if (!window->isEnabled) {
-             window->enabledStyleMask = [window->nsWindow styleMask];
-             [window->nsWindow setStyleMask: (window->enabledStyleMask & ~(NSUInteger)(NSMiniaturizableWindowMask | NSResizableWindowMask))];
- 
-             //XXX: perhaps we could simply enable/disable the buttons w/o playing with the styles at all
              NSButton *zoomButton = [window->nsWindow standardWindowButton:NSWindowZoomButton];
!             [zoomButton setEnabled:NO];
!         } else {
              [window->nsWindow setStyleMask: window->enabledStyleMask];
- 
              if (window->enabledStyleMask & NSResizableWindowMask) {
-                 NSButton *zoomButton = [window->nsWindow standardWindowButton:NSWindowZoomButton];
                  [zoomButton setEnabled:YES];
              }
          }
      }
      GLASS_POOL_EXIT;
      GLASS_CHECK_EXCEPTION(env);
  }
  
--- 826,852 ----
      GLASS_ASSERT_MAIN_JAVA_THREAD(env);
      GLASS_POOL_ENTER;
      {
          GlassWindow *window = getGlassWindow(env, jPtr);
          window->isEnabled = (BOOL)isEnabled;
          NSButton *zoomButton = [window->nsWindow standardWindowButton:NSWindowZoomButton];
!         if ((window->isEnabled)&&(window->isResizable)){
              [window->nsWindow setStyleMask: window->enabledStyleMask];
              if (window->enabledStyleMask & NSResizableWindowMask) {
                  [zoomButton setEnabled:YES];
              }
          }
+         else if((window->isEnabled)&&(!window->isResizable)){
+             [window->nsWindow setStyleMask: (window->enabledStyleMask & ~(NSUInteger)
+                                              NSResizableWindowMask)];
+             [zoomButton setEnabled:NO];
+         }
+         else{
+             window->enabledStyleMask = [window->nsWindow styleMask];
+             [window->nsWindow setStyleMask: (window->enabledStyleMask & ~(NSUInteger)(NSMiniaturizableWindowMask | NSResizableWindowMask))];
+             [zoomButton setEnabled:NO];
+         }
      }
      GLASS_POOL_EXIT;
      GLASS_CHECK_EXCEPTION(env);
  }