[Actionstep-commits] actionstep/src/org/actionstep ASRootWindowView.as,1.9,1.10

[Richard K. <ric...@us...>]

Update of /cvsroot/actionstep/actionstep/src/org/actionstep
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23483

Modified Files:
	ASRootWindowView.as 
Log Message:
don't allow reduction less than title size

Index: ASRootWindowView.as
===================================================================
RCS file: /cvsroot/actionstep/actionstep/src/org/actionstep/ASRootWindowView.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ASRootWindowView.as	7 Jul 2005 05:20:09 -0000	1.9
--- ASRootWindowView.as	7 Jul 2005 05:33:03 -0000	1.10
***************
*** 147,151 ****
        m_resizeRect.origin.x = m_resizeClip._x;
        m_resizeRect.origin.y = m_resizeClip._y;
!       m_titleTextField._x = (m_frame.size.width - (m_titleTextField.textWidth+4))/2;
      }
    }
--- 147,151 ----
        m_resizeRect.origin.x = m_resizeClip._x;
        m_resizeRect.origin.y = m_resizeClip._y;
!       m_titleTextField._x = (m_frame.size.width - (m_titleTextField.textWidth+2))/2;
      }
    }
***************
*** 383,390 ****
        return;
      }
!     m_window.setFrame(new NSRect(m_trackingData.origin.x, m_trackingData.origin.y, 
!             event.mouseLocation.x - m_trackingData.origin.x + m_trackingData.offsetX,
!             event.mouseLocation.y - m_trackingData.origin.y + m_trackingData.offsetY
!             ));
      NSApplication.sharedApplication().callObjectSelectorWithNextEventMatchingMaskDequeue(this, "resizeWindowCallback", m_trackingData.eventMask, true);
    }
--- 383,395 ----
        return;
      }
!     var width:Number = event.mouseLocation.x - m_trackingData.origin.x + m_trackingData.offsetX;
!     var height:Number = event.mouseLocation.y - m_trackingData.origin.y + m_trackingData.offsetY;
!     if (width < m_titleTextField.textWidth+30) {
!       width = m_titleTextField.textWidth+30;
!     }
!     if (height < 24) {
!       height = 24;
!     }
!     m_window.setFrame(new NSRect(m_trackingData.origin.x, m_trackingData.origin.y, width, height));
      NSApplication.sharedApplication().callObjectSelectorWithNextEventMatchingMaskDequeue(this, "resizeWindowCallback", m_trackingData.eventMask, true);
    }
***************
*** 419,423 ****
        m_titleTextField.text = m_window.title();
        m_titleTextField._y = (22 - (m_titleTextField.textHeight+2))/2;;
!       m_titleTextField._x = (width - (m_titleTextField.textWidth+4))/2;
      }
      m_titleTextFormat.color = isKey ? m_titleKeyFontColor.value : m_titleFontColor.value;
--- 424,428 ----
        m_titleTextField.text = m_window.title();
        m_titleTextField._y = (22 - (m_titleTextField.textHeight+2))/2;;
!       m_titleTextField._x = (width - (m_titleTextField.textWidth+2))/2;
      }
      m_titleTextFormat.color = isKey ? m_titleKeyFontColor.value : m_titleFontColor.value;