Author: rmottola
Date: Thu Apr 7 18:42:52 2016
New Revision: 39643
URL: http://svn.gna.org/viewcvs/gnustep?rev=39643&view=rev
Log:
Refactor heighOfFont to heightOfFont
Modified:
apps/gworkspace/trunk/ChangeLog
apps/gworkspace/trunk/FSNode/FSNBrowser.m
apps/gworkspace/trunk/FSNode/FSNBrowserCell.m
apps/gworkspace/trunk/FSNode/FSNBrowserColumn.m
apps/gworkspace/trunk/FSNode/FSNIcon.m
apps/gworkspace/trunk/FSNode/FSNIconsView.m
apps/gworkspace/trunk/FSNode/FSNListView.m
apps/gworkspace/trunk/FSNode/FSNPathComponentsViewer.m
apps/gworkspace/trunk/FSNode/FSNodeRep.h
apps/gworkspace/trunk/FSNode/FSNodeRep.m
apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m
apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerIconsPath.m
apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerShelf.m
apps/gworkspace/trunk/GWorkspace/History/History.m
Modified: apps/gworkspace/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog (original)
+++ apps/gworkspace/trunk/ChangeLog Thu Apr 7 18:42:52 2016
@@ -2,6 +2,21 @@
* FSNode/FSNodeRep.m
Cleanup and use NSUInteger
+
+ * FSNode/FSNBrowser.m
+ * FSNode/FSNBrowserCell.m
+ * FSNode/FSNBrowserColumn.m
+ * FSNode/FSNIcon.m
+ * FSNode/FSNIconsView.m
+ * FSNode/FSNListView.m
+ * FSNode/FSNPathComponentsViewer.m
+ * FSNode/FSNodeRep.h
+ * FSNode/FSNodeRep.m
+ * GWorkspace/Desktop/GWDesktopView.m
+ * GWorkspace/FileViewer/GWViewerIconsPath.m
+ * GWorkspace/FileViewer/GWViewerShelf.m
+ * GWorkspace/History/History.
+ Refactor heighOfFont to heightOfFont
2016-04-06 17:41-EDT Gregory John Casamento <[email protected]>
Modified: apps/gworkspace/trunk/FSNode/FSNBrowser.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNBrowser.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNBrowser.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNBrowser.m Thu Apr 7 18:42:52 2016
@@ -2169,7 +2169,7 @@
if (canedit) {
NSMatrix *matrix = [col cmatrix];
NSFont *edfont = [nameEditor font];
- float fnheight = [fsnodeRep heighOfFont: edfont];
+ float fnheight = [fsnodeRep heightOfFont: edfont];
NSRect r = [cell labelRect];
r = [matrix convertRect: r toView: self];
Modified: apps/gworkspace/trunk/FSNode/FSNBrowserCell.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNBrowserCell.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNBrowserCell.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNBrowserCell.m Thu Apr 7 18:42:52 2016
@@ -1,6 +1,6 @@
/* FSNBrowserCell.m
*
- * Copyright (C) 2004-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2004-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: March 2004
@@ -229,7 +229,7 @@
if (icon == nil) {
if (nameEdited == NO) {
if (infoCell) {
- infoheight = floor([[FSNodeRep sharedInstance] heighOfFont:
[infoCell font]]);
+ infoheight = floor([[FSNodeRep sharedInstance] heightOfFont:
[infoCell font]]);
if (([self isHighlighted] || [self state]) && (nameEdited == NO)) {
[[self highlightColorInView: controlView] set];
@@ -430,7 +430,7 @@
{
if (selection) {
NSMutableArray *selpaths = [NSMutableArray array];
- int i;
+ NSUInteger i;
for (i = 0; i < [selection count]; i++) {
[selpaths addObject: [[selection objectAtIndex: i] path]];
Modified: apps/gworkspace/trunk/FSNode/FSNBrowserColumn.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNBrowserColumn.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNBrowserColumn.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNBrowserColumn.m Thu Apr 7 18:42:52 2016
@@ -1,6 +1,6 @@
/* FSNBrowserColumn.m
*
- * Copyright (C) 2004-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2004-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: July 2004
@@ -113,7 +113,7 @@
[self setFrame: rect];
fsnodeRep = [FSNodeRep sharedInstance];
- lineh = floor([fsnodeRep heighOfFont: [acell font]]);
+ lineh = floor([fsnodeRep heightOfFont: [acell font]]);
scroll = [[FSNBrowserScroll alloc] initWithFrame: rect
inColumn: self acceptDnd:
cellsIcon];
@@ -158,7 +158,7 @@
{
if (infoType != type) {
NSArray *cells = [matrix cells];
- int lineh = floor([fsnodeRep heighOfFont: [cellPrototype font]]);
+ int lineh = floor([fsnodeRep heightOfFont: [cellPrototype font]]);
NSUInteger i;
infoType = type;
@@ -186,7 +186,7 @@
{
if ((extInfoType == nil) || ([extInfoType isEqual: type] == NO)) {
NSArray *cells = [matrix cells];
- int lineh = floor([fsnodeRep heighOfFont: [cellPrototype font]]);
+ int lineh = floor([fsnodeRep heightOfFont: [cellPrototype font]]);
NSUInteger i;
infoType = FSNInfoExtendedType;
Modified: apps/gworkspace/trunk/FSNode/FSNIcon.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNIcon.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNIcon.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNIcon.m Thu Apr 7 18:42:52 2016
@@ -1,6 +1,6 @@
/* FSNIcon.m
*
- * Copyright (C) 2004-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2004-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: March 2004
@@ -217,7 +217,7 @@
labelRect = NSZeroRect;
labelRect.size.width = [label uncutTitleLenght] + [fsnodeRep labelMargin];
- labelRect.size.height = [fsnodeRep heighOfFont: [label font]];
+ labelRect.size.height = [fsnodeRep heightOfFont: [label font]];
labelRect = NSIntegralRect(labelRect);
infoRect = NSZeroRect;
@@ -226,7 +226,7 @@
} else {
infoRect.size.width = labelRect.size.width;
}
- infoRect.size.height = [fsnodeRep heighOfFont: [infolabel font]];
+ infoRect.size.height = [fsnodeRep heightOfFont: [infolabel font]];
infoRect = NSIntegralRect(infoRect);
icnPosition = ipos;
@@ -875,7 +875,7 @@
[infolabel setFont: infoFont];
labelRect.size.width = myrintf([label uncutTitleLenght] + lblmargin);
- labelRect.size.height = myrintf([fsnodeRep heighOfFont: [label font]]);
+ labelRect.size.height = myrintf([fsnodeRep heightOfFont: [label font]]);
labelRect = NSIntegralRect(labelRect);
infoRect = NSZeroRect;
@@ -884,7 +884,7 @@
} else {
infoRect.size.width = labelRect.size.width;
}
- infoRect.size.height = [fsnodeRep heighOfFont: infoFont];
+ infoRect.size.height = [fsnodeRep heightOfFont: infoFont];
infoRect = NSIntegralRect(infoRect);
[self tile];
@@ -927,7 +927,7 @@
ASSIGN (highlightPath, [fsnodeRep highlightPathOfSize: hlightRect.size]);
labelRect.size.width = [label uncutTitleLenght] + [fsnodeRep labelMargin];
- labelRect.size.height = [fsnodeRep heighOfFont: [label font]];
+ labelRect.size.height = [fsnodeRep heightOfFont: [label font]];
[self tile];
}
Modified: apps/gworkspace/trunk/FSNode/FSNIconsView.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNIconsView.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNIconsView.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNIconsView.m Thu Apr 7 18:42:52 2016
@@ -217,7 +217,7 @@
highlightSize.height = iconSize + 4;
}
- labelSize.height = floor([fsnodeRep heighOfFont: labelFont]);
+ labelSize.height = floor([fsnodeRep heightOfFont: labelFont]);
labelSize.width = [fsnodeRep labelWFactor] * labelTextSize;
gridSize.height = highlightSize.height;
Modified: apps/gworkspace/trunk/FSNode/FSNListView.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNListView.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNListView.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNListView.m Thu Apr 7 18:42:52 2016
@@ -1409,7 +1409,7 @@
unsigned col = [listView columnWithIdentifier: num];
NSRect r = [listView frameOfCellAtColumn: col row: row];
NSFont *edfont = [nameEditor font];
- float fnheight = [fsnodeRep heighOfFont: edfont];
+ float fnheight = [fsnodeRep heightOfFont: edfont];
float xshift = [[rep icon] size].width + 4;
Modified: apps/gworkspace/trunk/FSNode/FSNPathComponentsViewer.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNPathComponentsViewer.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNPathComponentsViewer.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNPathComponentsViewer.m Thu Apr 7
18:42:52 2016
@@ -1,6 +1,6 @@
/* FSNPathComponentsViewer.m
*
- * Copyright (C) 2005-2010 Free Software Foundation, Inc.
+ * Copyright (C) 2005-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: October 2005
@@ -346,7 +346,7 @@
if (labelRect.size.width <= ([self bounds].size.width - minwidth)) {
labelRect.origin.x = iconRect.size.width + ELEM_MARGIN;
- labelRect.size.height = [fsnodeRep heighOfFont: [label font]];
+ labelRect.size.height = [fsnodeRep heightOfFont: [label font]];
labelRect.origin.y = (iconRect.size.height - labelRect.size.height) / 2;
labelRect = NSIntegralRect(labelRect);
} else {
Modified: apps/gworkspace/trunk/FSNode/FSNodeRep.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNodeRep.h?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNodeRep.h (original)
+++ apps/gworkspace/trunk/FSNode/FSNodeRep.h Thu Apr 7 18:42:52 2016
@@ -389,7 +389,7 @@
- (void)setLabelWFactor:(float)f;
-- (float)heighOfFont:(NSFont *)font;
+- (float)heightOfFont:(NSFont *)font;
- (int)defaultIconBaseShift;
Modified: apps/gworkspace/trunk/FSNode/FSNodeRep.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNodeRep.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNodeRep.m (original)
+++ apps/gworkspace/trunk/FSNode/FSNodeRep.m Thu Apr 7 18:42:52 2016
@@ -355,7 +355,7 @@
labelWFactor = f;
}
-- (float)heighOfFont:(NSFont *)font
+- (float)heightOfFont:(NSFont *)font
{
// return [font defaultLineHeightForFont];
return ([font pointSize] * FONT_H_FACT);
Modified: apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m (original)
+++ apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m Thu Apr 7
18:42:52 2016
@@ -355,9 +355,9 @@
if (iconPosition == NSImageAbove) {
hlightRect.origin.x = ceil((gridSize.width - hlightRect.size.width) / 2);
if (infoType != FSNInfoNameType) {
- hlightRect.origin.y = floor([fsnodeRep heighOfFont: labelFont] * 2 - 2);
+ hlightRect.origin.y = floor([fsnodeRep heightOfFont: labelFont] * 2 - 2);
} else {
- hlightRect.origin.y = floor([fsnodeRep heighOfFont: labelFont]);
+ hlightRect.origin.y = floor([fsnodeRep heightOfFont: labelFont]);
}
} else {
hlightRect.origin.x = 0;
Modified: apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerIconsPath.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerIconsPath.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerIconsPath.m
(original)
+++ apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerIconsPath.m Thu Apr
7 18:42:52 2016
@@ -287,7 +287,7 @@
highlightSize.height = iconSize + 4;
}
- labelSize.height = myrintf([fsnodeRep heighOfFont: labelFont]);
+ labelSize.height = myrintf([fsnodeRep heightOfFont: labelFont]);
gridSize.height = highlightSize.height + labelSize.height;
}
Modified: apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerShelf.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerShelf.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerShelf.m (original)
+++ apps/gworkspace/trunk/GWorkspace/FileViewer/GWViewerShelf.m Thu Apr 7
18:42:52 2016
@@ -1,6 +1,6 @@
/* GWViewerShelf.h
*
- * Copyright (C) 2004-2014 Free Software Foundation, Inc.
+ * Copyright (C) 2004-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: July 2004
@@ -376,7 +376,7 @@
highlightSize.height = iconSize + 4;
}
- labelSize.height = myrintf([fsnodeRep heighOfFont: labelFont]);
+ labelSize.height = myrintf([fsnodeRep heightOfFont: labelFont]);
labelSize.width = gridSize.width;
gridSize.height = highlightSize.height + labelSize.height;
}
@@ -501,7 +501,7 @@
hlightRect.size.width = ceil(iconSize / 3 * 4);
hlightRect.size.height = ceil(hlightRect.size.width * [fsnodeRep
highlightHeightFactor]);
hlightRect.origin.x = ceil((gridSize.width - hlightRect.size.width) / 2);
- hlightRect.origin.y = floor([fsnodeRep heighOfFont: labelFont]);
+ hlightRect.origin.y = floor([fsnodeRep heightOfFont: labelFont]);
icnBounds.origin.x += hlightRect.origin.x + ((hlightRect.size.width -
iconSize) / 2);
icnBounds.origin.y += hlightRect.origin.y + ((hlightRect.size.height -
iconSize) / 2);
@@ -512,13 +512,13 @@
- (void)tile
{
NSArray *subviews = [self subviews];
- int i;
+ NSUInteger i;
[self makeIconsGrid];
for (i = 0; i < [icons count]; i++) {
FSNIcon *icon = [icons objectAtIndex: i];
- int index = [icon gridIndex];
+ NSUInteger index = [icon gridIndex];
if (index < gridcount) {
if ([subviews containsObject: icon] == NO) {
Modified: apps/gworkspace/trunk/GWorkspace/History/History.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/History/History.m?rev=39643&r1=39642&r2=39643&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/History/History.m (original)
+++ apps/gworkspace/trunk/GWorkspace/History/History.m Thu Apr 7 18:42:52 2016
@@ -1,6 +1,6 @@
/* History.m
*
- * Copyright (C) 2003-2010 Free Software Foundation, Inc.
+ * Copyright (C) 2003-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: August 2001
@@ -78,7 +78,7 @@
[matrix setDoubleAction: @selector(matrixAction:)];
[matrix setIntercellSpacing: NSZeroSize];
ms.width = [[scrollView contentView] bounds].size.width;
- ms.height = [[FSNodeRep sharedInstance] heighOfFont: [NSFont
systemFontOfSize: 12]];
+ ms.height = [[FSNodeRep sharedInstance] heightOfFont: [NSFont
systemFontOfSize: 12]];
[matrix setCellSize: ms];
[matrix setAutoscroll: YES];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
