Merge branch 'master' of github.com:280north/cappuccino

This commit is contained in:
Francisco Ryan Tolmasky I committed 2010-12-26 15:27:10 -08:00
commit 031a380c25
9 files changed
+481 -61

No files matched your search

+21
View File
@@ -115,6 +115,27 @@ CPTableColumnUserResizingMask = 1 << 1;
return _tableView;
}
/*!
@ignore
this method tries to resize a column called via the tableview via autoresizing
it returns the delta from the actual resize and the proposed resize
for example if the column should have been resized 50px but the maxWidth was hit only
after 25px then the return value would be 25px;
if no edge has been hit zero will be returned
*/
- (int)_tryToResizeToWidth:(int)width
{
var min = [self minWidth],
max = [self maxWidth],
newWidth = MIN(MAX(width, min), max);
[self setWidth:newWidth];
return newWidth - width;
}
/*!
Set the width of the column
Default value is: 100
+57 -61
View File
@@ -1774,6 +1774,25 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
var mask = _columnAutoResizingStyle;
// should we actually do some resizing?
if (!_lastColumnShouldSnap)
{
// did the clip view intersect the old tablesize?
var superview = [self superview];
if (!superview || ![superview isKindOfClass:[CPClipView class]])
return;
var superviewWidth = [superview bounds].size.width,
lastColumnMaxX = _CGRectGetMaxX([self rectOfColumn:[self numberOfColumns] -1]);
// Fix me: this fires on the table setup at times
if (lastColumnMaxX >= superviewWidth && lastColumnMaxX <= aSize.width || lastColumnMaxX <= superviewWidth && lastColumnMaxX >= aSize.width)
_lastColumnShouldSnap = YES;
else
return;
}
if (mask === CPTableViewUniformColumnAutoresizingStyle)
[self _resizeAllColumnUniformlyWithOldSize:aSize];
else if (mask === CPTableViewLastColumnOnlyAutoresizingStyle)
@@ -1818,10 +1837,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
newWidth = superviewSize.width - totalWidth;
newWidth += [columnToResize width];
newWidth = MAX([columnToResize minWidth], newWidth);
newWidth = MIN([columnToResize maxWidth], newWidth);
[columnToResize setWidth:FLOOR(newWidth)];
[columnToResize _tryToResizeToWidth:newWidth];
}
[self setNeedsLayout];
@@ -1834,74 +1850,59 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
*/
- (void)_resizeAllColumnUniformlyWithOldSize:(CGSize)oldSize
{
// what we care about is the superview clip rect
// FIX ME: if it's not in a scrollview this doesn't really work
var superview = [self superview];
if (!superview)
if (!superview || ![superview isKindOfClass:[CPClipView class]])
return;
var superviewSize = [superview bounds].size;
UPDATE_COLUMN_RANGES_IF_NECESSARY();
var count = NUMBER_OF_COLUMNS(),
visColumns = [[CPArray alloc] init],
buffer = 0.0;
var superviewWidth = [superview bounds].size.width,
count = NUMBER_OF_COLUMNS(),
resizableColumns = [CPIndexSet indexSet],
remainingSpace = 0.0,
i = 0;
// Fixme: cache resizable columns because they won't changes betwwen two calls to this method.
for (var i = 0; i < count; i++)
// find resizable columns
// FIX ME: we could cache resizableColumns after this loop and reuse it durring the resize
for (; i < count; i++)
{
var tableColumn = _tableColumns[i];
if (![tableColumn isHidden] && ([tableColumn resizingMask] & CPTableColumnAutoresizingMask))
[visColumns addObject:i];
[resizableColumns addIndex:i];
}
// redefine count
count = [visColumns count];
var maxXofColumns = _CGRectGetMaxX([self rectOfColumn:[resizableColumns lastIndex]]),
remainingSpace = superviewWidth - maxXofColumns,
resizeableColumnsCount = [resizableColumns count],
proportionate = 0;
//if there are columns
if (count > 0)
while (remainingSpace && resizeableColumnsCount)
{
var maxXofColumns = CGRectGetMaxX([self rectOfColumn:visColumns[count - 1]]);
// Divy out the space.
proportionate += remainingSpace / resizeableColumnsCount;
// If the x value of the end of the last column is between the current bounds and the previous bounds we should snap.
if (!_lastColumnShouldSnap && (maxXofColumns >= superviewSize.width && maxXofColumns <= oldSize.width || maxXofColumns <= superviewSize.width && maxXofColumns >= oldSize.width))
// Reset the remaining space to 0
remainingSpace = 0.0;
var index = CPNotFound;
while ((index = [resizableColumns indexGreaterThanIndex:index]) !== CPNotFound)
{
//set the snap mask
_lastColumnShouldSnap = YES;
//then we need to make sure everything is set correctly.
[self _resizeAllColumnUniformlyWithOldSize:CGSizeMake(maxXofColumns, 0)];
var item = _tableColumns[index],
proposedWidth = [item width] + proportionate,
resizeLeftovers = [item _tryToResizeToWidth:proposedWidth];
if (resizeLeftovers)
{
[resizableColumns removeIndex:index];
remainingSpace += resizeLeftovers;
}
}
if (!_lastColumnShouldSnap)
return;
// FIX ME: This is wrong because this should continue to resize all columns
// If the last column reaches it's max/min it will simply stop resizing,
// correct behavior is to resize all columns until they reach their min/max
for (var i = 0; i < count; i++)
{
var column = visColumns[i],
columnToResize = _tableColumns[column],
currentBuffer = buffer / (count - i),
realNewWidth = ([columnToResize width] / oldSize.width * [superview bounds].size.width) + currentBuffer,
newWidth = realNewWidth;
newWidth = MAX([columnToResize minWidth], newWidth);
newWidth = MIN([columnToResize maxWidth], newWidth);
buffer -= currentBuffer;
// the buffer takes into account the min/max width of the column
buffer += realNewWidth - newWidth;
[columnToResize setWidth:newWidth];
}
// if there is space left over that means column resize was too long or too short
if (buffer !== 0)
_lastColumnShouldSnap = NO;
}
[self setNeedsLayout];
}
/*!
@@ -1943,18 +1944,13 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
//decrement the counter until we get to the last row that's not hidden
while (count-- && [_tableColumns[count] isHidden]) ;
//if the last row exists
//if the last column exists
if (count >= 0)
{
var columnToResize = _tableColumns[count],
newSize = MAX(0.0, superviewSize.width - CGRectGetMinX([self rectOfColumn:count]) - _intercellSpacing.width);
if (newSize > 0)
{
newSize = MAX([columnToResize minWidth], newSize);
newSize = MIN([columnToResize maxWidth], newSize);
[columnToResize setWidth:newSize];
}
[columnToResize newWidth:newSize];
}
[self setNeedsLayout];
@@ -0,0 +1,97 @@
/*
* AppController.j
* ColumnResize
*
* Created by You on December 10, 2010.
* Copyright 2010, Your Company All rights reserved.
*/
@import <Foundation/CPObject.j>
@implementation AppController : CPObject
{
}
- (void)applicationDidFinishLaunching:(CPNotification)aNotification
{
var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask],
contentView = [theWindow contentView];
var scroll = [[CPScrollView alloc] initWithFrame:[contentView bounds]];
[scroll setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
table = [[CPTableView alloc] initWithFrame:CGRectMakeZero()];
[table setDataSource:self];
[table setDelegate:self];
[table setColumnAutoresizingStyle:CPTableViewUniformColumnAutoresizingStyle];
[table setUsesAlternatingRowBackgroundColors:YES];
[table setGridStyleMask:CPTableViewSolidVerticalGridLineMask | CPTableViewSolidHorizontalGridLineMask];
[table setAllowsMultipleSelection:YES];
[table setIntercellSpacing:CGSizeMake(0,0)];
columnA = [[CPTableColumn alloc] initWithIdentifier:"A"];
[table addTableColumn:columnA];
[[columnA headerView] setStringValue:"A"];
[columnA setWidth:175];
[columnA setMinWidth:100];
[columnA setMaxWidth:250];
columnB = [[CPTableColumn alloc] initWithIdentifier:"B"];
[table addTableColumn:columnB];
[[columnB headerView] setStringValue:"B"];
[columnB setWidth:175];
[columnB setMinWidth:100];
columnC = [[CPTableColumn alloc] initWithIdentifier:"C"];
[table addTableColumn:columnC];
[[columnC headerView] setStringValue:"C"];
[columnC setWidth:175];
[columnC setMinWidth:100];
columnD = [[CPTableColumn alloc] initWithIdentifier:"D"];
[table addTableColumn:columnD];
[[columnD headerView] setStringValue:"D"];
[columnD setWidth:175];
[columnD setMaxWidth:200];
[columnD setMinWidth:100];
columnE = [[CPTableColumn alloc] initWithIdentifier:"E"];
[table addTableColumn:columnE];
[[columnE headerView] setStringValue:"E"];
[columnE setWidth:175];
[columnE setMaxWidth:200];
[columnE setMinWidth:100];
[scroll setDocumentView:table];
[contentView addSubview:scroll];
[theWindow orderFront:self];
// Uncomment the following line to turn on the standard menu bar.
//[CPMenu setMenuBarVisible:YES];
}
- (int)numberOfRowsInTableView:(id)tableView
{
return 2000;
}
- (id)tableView:(id)tableView objectValueForTableColumn:(CPTableColumn)aColumn row:(int)aRow
{
return "Column " + [aColumn identifier] + " Row " + aRow;
}
- (int)tableView:(CPTableView)aTableView heightOfRow:(int)aRow
{
return aRow % 2 ? 200 : 50;
return aRow % 2 ? 1010 - (aRow * 10) : 10 + (aRow * 10);
}
@end
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CPApplicationDelegateClass</key>
<string>AppController</string>
<key>CPBundleName</key>
<string>ColumnResize</string>
<key>CPPrincipalClass</key>
<string>CPApplication</string>
</dict>
</plist>
@@ -0,0 +1,93 @@
/*
* Jakefile
* ColumnResize
*
* Created by You on December 10, 2010.
* Copyright 2010, Your Company All rights reserved.
*/
var ENV = require("system").env,
FILE = require("file"),
JAKE = require("jake"),
task = JAKE.task,
FileList = JAKE.FileList,
app = require("cappuccino/jake").app,
configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
OS = require("os");
app ("ColumnResize", function(task)
{
task.setBuildIntermediatesPath(FILE.join("Build", "ColumnResize.build", configuration));
task.setBuildPath(FILE.join("Build", configuration));
task.setProductName("ColumnResize");
task.setIdentifier("com.yourcompany.ColumnResize");
task.setVersion("1.0");
task.setAuthor("Your Company");
task.setEmail("feedback @nospam@ yourcompany.com");
task.setSummary("ColumnResize");
task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
task.setResources(new FileList("Resources/**"));
task.setIndexFilePath("index.html");
task.setInfoPlistPath("Info.plist");
if (configuration === "Debug")
task.setCompilerFlags("-DDEBUG -g");
else
task.setCompilerFlags("-O");
});
task ("default", ["ColumnResize"], function()
{
printResults(configuration);
});
task ("build", ["default"]);
task ("debug", function()
{
ENV["CONFIGURATION"] = "Debug";
JAKE.subjake(["."], "build", ENV);
});
task ("release", function()
{
ENV["CONFIGURATION"] = "Release";
JAKE.subjake(["."], "build", ENV);
});
task ("run", ["debug"], function()
{
OS.system(["open", FILE.join("Build", "Debug", "ColumnResize", "index.html")]);
});
task ("run-release", ["release"], function()
{
OS.system(["open", FILE.join("Build", "Release", "ColumnResize", "index.html")]);
});
task ("deploy", ["release"], function()
{
FILE.mkdirs(FILE.join("Build", "Deployment", "ColumnResize"));
OS.system(["press", "-f", FILE.join("Build", "Release", "ColumnResize"), FILE.join("Build", "Deployment", "ColumnResize")]);
printResults("Deployment")
});
task ("desktop", ["release"], function()
{
FILE.mkdirs(FILE.join("Build", "Desktop", "ColumnResize"));
require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "ColumnResize"), FILE.join("Build", "Desktop", "ColumnResize", "ColumnResize.app"));
printResults("Desktop")
});
task ("run-desktop", ["desktop"], function()
{
OS.system([FILE.join("Build", "Desktop", "ColumnResize", "ColumnResize.app", "Contents", "MacOS", "NativeHost"), "-i"]);
});
function printResults(configuration)
{
print("----------------------------");
print(configuration+" app built at path: "+FILE.join("Build", configuration, "ColumnResize"));
print("----------------------------");
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

@@ -0,0 +1,104 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<!--
index-debug.html
ColumnResize
Created by You on December 10, 2010.
Copyright 2010, Your Company All rights reserved.
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-icon" href="Resources/icon.png" />
<link rel="apple-touch-startup-image" href="Resources/default.png" />
<title>ColumnResize</title>
<script type="text/javascript">
OBJJ_MAIN_FILE = "main.j";
OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
</script>
<script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
<script type="text/javascript">
objj_msgSend_reset();
// DEBUG OPTIONS:
// Uncomment to enable printing of backtraces on exceptions:
//objj_msgSend_decorate(objj_backtrace_decorator);
// Uncomment to supress exceptions that take place inside a message
//objj_msgSend_decorate(objj_supress_exceptions_decorator)
// Uncomment to enable runtime type checking:
//objj_msgSend_decorate(objj_typecheck_decorator);
// Uncomment (along with both above) to print backtraces on type check errors:
//objj_typecheck_prints_backtrace = true;
// Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
//CPLogUnregister(CPLogDefault);
// Uncomment to enable a specific logger:
//CPLogRegister(CPLogConsole);
//CPLogRegister(CPLogPopup);
</script>
<style type="text/css">
body{margin:0; padding:0;}
#container {position: absolute; top:50%; left:50%;}
#content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
#content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
#loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
</style>
<!--[if lt IE 7]>
<STYLE type="text/css">
#container { position: relative; top: 50%; }
#content { position: relative;}
</STYLE>
<![endif]-->
</head>
<body style="">
<div id="cappuccino-body">
<div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
<script type="text/javascript">
document.write("<div id='container'><p id='content'>" +
"<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
"Loading ColumnResize...</p></div>");
</script>
<noscript>
<div id="container">
<div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
<p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
<p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
<p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
<ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
<li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
<li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
<li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
<li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
<li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
</ul>
</div>
</div>
</noscript>
</div>
</div>
</body>
</html>
@@ -0,0 +1,79 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<!--
index.html
ColumnResize
Created by You on December 10, 2010.
Copyright 2010, Your Company All rights reserved.
-->
<head>
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<meta http-equiv="X-UA-Compatible" content="chrome=1" />
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-icon" href="Resources/icon.png" />
<link rel="apple-touch-startup-image" href="Resources/default.png" />
<title>ColumnResize</title>
<script type="text/javascript">
OBJJ_MAIN_FILE = "main.j";
</script>
<script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
<style type="text/css">
body{margin:0; padding:0;}
#container {position: absolute; top:50%; left:50%;}
#content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
#content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
#loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
</style>
<!--[if lt IE 7]>
<STYLE type="text/css">
#container { position: relative; top: 50%; }
#content { position: relative;}
</STYLE>
<![endif]-->
</head>
<body style="">
<div id="cappuccino-body">
<div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
<script type="text/javascript">
document.write("<div id='container'><p id='content'>" +
"<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
"Loading ColumnResize...</p></div>");
</script>
<noscript>
<div id="container">
<div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
<p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
<p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
<p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
<ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
<li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
<li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
<li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
<li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
<li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
</ul>
</div>
</div>
</noscript>
</div>
</div>
</body>
</html>
@@ -0,0 +1,18 @@
/*
* AppController.j
* ColumnResize
*
* Created by You on December 10, 2010.
* Copyright 2010, Your Company All rights reserved.
*/
@import <Foundation/Foundation.j>
@import <AppKit/AppKit.j>
@import "AppController.j"
function main(args, namedArgs)
{
CPApplicationMain(args, namedArgs);
}