gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-03 17:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed font height; changes in spacings when drawing

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5756 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2000-01-13 23:07:17 +00:00
parent a64130324e
commit a571c4f727
1 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Source/NSButtonCell.m
View file

@ -503,10 +503,19 @@
imageRect.origin = cellFrame.origin; imageRect.origin = cellFrame.origin;
imageRect.size.width = imageSize.width; imageRect.size.width = imageSize.width;
imageRect.size.height = cellFrame.size.height; imageRect.size.height = cellFrame.size.height;
if (_cell.is_bordered || _cell.is_bezeled)
{
imageRect.origin.x += 3;
imageRect.size.height -= 2;
imageRect.origin.y += 1;
}
titleRect = imageRect; titleRect = imageRect;
titleRect.origin.x += imageSize.width + xDist; titleRect.origin.x += imageSize.width + xDist;
titleRect.size.width = cellFrame.size.width - imageSize.width - xDist; titleRect.size.width = cellFrame.size.width - imageSize.width - xDist;
if (_cell.is_bordered || _cell.is_bezeled)
{
titleRect.size.width -= 3;
}
break; break;
case NSImageRight: case NSImageRight:
@ -514,10 +523,20 @@
imageRect.origin.y = cellFrame.origin.y; imageRect.origin.y = cellFrame.origin.y;
imageRect.size.width = imageSize.width; imageRect.size.width = imageSize.width;
imageRect.size.height = cellFrame.size.height; imageRect.size.height = cellFrame.size.height;
if (_cell.is_bordered || _cell.is_bezeled)
{
imageRect.origin.x -= 3;
imageRect.size.height -= 2;
imageRect.origin.y += 1;
}
titleRect.origin = cellFrame.origin; titleRect.origin = cellFrame.origin;
titleRect.size.width = cellFrame.size.width - imageSize.width - xDist; titleRect.size.width = cellFrame.size.width - imageSize.width - xDist;
titleRect.size.height = cellFrame.size.height; titleRect.size.height = cellFrame.size.height;
if (_cell.is_bordered || _cell.is_bezeled)
{
titleRect.origin.x += 3;
titleRect.size.width -= 3;
}
break; break;
case NSImageAbove: case NSImageAbove:
@ -528,6 +547,7 @@
titleRect.size.width = cellFrame.size.width; titleRect.size.width = cellFrame.size.width;
titleRect.size.height = cellFrame.size.height - imageSize.height titleRect.size.height = cellFrame.size.height - imageSize.height
- yDist; - yDist;
// TODO: Add distance from border if needed
if (flippedView) if (flippedView)
{ {
imageRect.origin.y = NSMinY(cellFrame); imageRect.origin.y = NSMinY(cellFrame);
@ -548,6 +568,7 @@
titleRect.size.width = cellFrame.size.width; titleRect.size.width = cellFrame.size.width;
titleRect.size.height = cellFrame.size.height - imageSize.height titleRect.size.height = cellFrame.size.height - imageSize.height
- yDist; - yDist;
// TODO: Add distance from border if needed
if (flippedView) if (flippedView)
{ {
imageRect.origin.y = NSMaxY(cellFrame) - imageRect.size.height; imageRect.origin.y = NSMaxY(cellFrame) - imageRect.size.height;
@ -563,6 +584,7 @@
case NSImageOverlaps: case NSImageOverlaps:
titleRect = cellFrame; titleRect = cellFrame;
imageRect = cellFrame; imageRect = cellFrame;
// TODO: Add distance from border if needed
break; break;
} }
if (imageToDisplay != nil) if (imageToDisplay != nil)
@ -634,7 +656,7 @@
if (titleToDisplay) if (titleToDisplay)
titleSize = NSMakeSize ([_cell_font widthOfString: titleToDisplay], titleSize = NSMakeSize ([_cell_font widthOfString: titleToDisplay],
[_cell_font pointSize]); [_cell_font boundingRectForFont].size.height);
else else
titleSize = NSZeroSize; titleSize = NSZeroSize;
@ -680,19 +702,19 @@
break; break;
} }
// Add some spacing between text/image and border
// if there is text in the button
if (titleToDisplay) {
s.width += 2 * xDist;
s.height += 2 * yDist;
}
// Get border size // Get border size
if (_cell.is_bordered) if (_cell.is_bordered)
// Buttons only have three paths for border (NeXT looks) // Buttons only have three paths for border (NeXT looks)
borderSize = NSMakeSize (1.5, 1.5); borderSize = NSMakeSize (1.5, 1.5);
else else
borderSize = NSZeroSize; borderSize = NSZeroSize;
if ((_cell.is_bordered || _cell.is_bezeled)
&& (_cell.image_position != NSImageOnly))
{
borderSize.height += 1;
borderSize.width += 3;
}
// Add border size // Add border size
s.width += 2 * borderSize.width; s.width += 2 * borderSize.width;