From 4ab69ebb68b9702f8a20b78bf97c8f54a2048e50 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Wed, 18 May 2011 10:29:54 -0700 Subject: [PATCH] If there is no header view, there should be no corner view. This is what Cocoa does. Also for correctness -enclosingScrollView should be used to get the table's scrollview. Test app included. --- AppKit/CPTableView.j | 10 +- .../HeaderView-CornerView/AppController.j | 115 ++++++++++++++++++ .../HeaderView-CornerView/Info.plist | 12 ++ .../TableTest/HeaderView-CornerView/Jakefile | 93 ++++++++++++++ .../Resources/spinner.gif | Bin 0 -> 1849 bytes .../HeaderView-CornerView/index-debug.html | 103 ++++++++++++++++ .../HeaderView-CornerView/index.html | 78 ++++++++++++ .../TableTest/HeaderView-CornerView/main.j | 18 +++ 8 files changed, 427 insertions(+), 2 deletions(-) create mode 100644 Tests/Manual/TableTest/HeaderView-CornerView/AppController.j create mode 100644 Tests/Manual/TableTest/HeaderView-CornerView/Info.plist create mode 100644 Tests/Manual/TableTest/HeaderView-CornerView/Jakefile create mode 100644 Tests/Manual/TableTest/HeaderView-CornerView/Resources/spinner.gif create mode 100644 Tests/Manual/TableTest/HeaderView-CornerView/index-debug.html create mode 100644 Tests/Manual/TableTest/HeaderView-CornerView/index.html create mode 100644 Tests/Manual/TableTest/HeaderView-CornerView/main.j diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 018b8ab45..104b292db 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -1470,7 +1470,7 @@ NOT YET IMPLEMENTED _cornerView = aView; - var scrollView = [[self superview] superview]; + var scrollView = [self enclosingScrollView]; if ([scrollView isKindOfClass:[CPScrollView class]] && [scrollView documentView] === self) [scrollView _updateCornerAndHeaderView]; @@ -1506,8 +1506,14 @@ NOT YET IMPLEMENTED [_headerView setTableView:self]; [_headerView setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), _CGRectGetHeight([_headerView frame]))]; } + else + { + // If there is no header view, there should be no corner view + [_cornerView removeFromSuperview]; + _cornerView = nil; + } - var scrollView = [[self superview] superview]; + var scrollView = [self enclosingScrollView]; if ([scrollView isKindOfClass:[CPScrollView class]] && [scrollView documentView] === self) [scrollView _updateCornerAndHeaderView]; diff --git a/Tests/Manual/TableTest/HeaderView-CornerView/AppController.j b/Tests/Manual/TableTest/HeaderView-CornerView/AppController.j new file mode 100644 index 000000000..128482b8c --- /dev/null +++ b/Tests/Manual/TableTest/HeaderView-CornerView/AppController.j @@ -0,0 +1,115 @@ +/* + * AppController.j + * HeaderView-CornerView + * + * Created by aparajita on May 18, 2011. + * Copyright 2011, Victory-Heart Productions All rights reserved. + */ + +@import + +var brokenTable = nil, + fixedTable = nil; + +@implementation AppController : CPObject +{ + CPWindow theWindow; +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask]; + + brokenTable = [self makeTableWithCaption:@"No header, has corner: wrong" at:CPPointMake(50, 50)]; + fixedTable = [self makeTableWithCaption:@"No header, no corner: correct" at:CPPointMake(250, 50)]; + + [brokenTable setHeaderView:nil]; + [fixedTable setHeaderView:nil]; + + [theWindow orderFront:self]; + + // Uncomment the following line to turn on the standard menu bar. + //[CPMenu setMenuBarVisible:YES]; +} + +- (void)makeTableWithCaption:(CPString)caption at:(CGPoint)location +{ + var label = [CPTextField labelWithTitle:caption], + table = [[CPTableView alloc] initWithFrame:CGRectMakeZero()], + frame = CGRectMake(location.x, location.y + 25, 150, ([table rowHeight] * 5) + 2), + scroll = [[CPScrollView alloc] initWithFrame:frame]; + + [label setFrameOrigin:CGPointMake(location.x, location.y)]; + + [table setDataSource:self]; + [table setDelegate:self]; + [table setColumnAutoresizingStyle:CPTableViewLastColumnOnlyAutoresizingStyle]; + [table setUsesAlternatingRowBackgroundColors:YES]; + [table setAllowsMultipleSelection:NO]; + [table setIntercellSpacing:CGSizeMake(0, 0)]; + + var column = [[CPTableColumn alloc] initWithIdentifier:"1"]; + + [column setWidth:CGRectGetWidth(frame) - [CPScroller scrollerWidth]]; + [column setResizingMask:CPTableColumnNoResizing]; + [table addTableColumn:column]; + [table selectRowIndexes:[CPIndexSet indexSetWithIndex:0] byExtendingSelection:NO]; + + [scroll setBorderType:CPLineBorder]; + [scroll setHasHorizontalScroller:NO]; + [scroll setDocumentView:table]; + + var contentView = [theWindow contentView]; + + [contentView addSubview:label]; + [contentView addSubview:scroll]; + + return table; +} + +/*! + Returns the number of rows in the table data. + The default implementation returns the size of the table data array. +*/ +- (int)numberOfRowsInTableView:(id)tableView +{ + return 10; +} + +- (id)tableView:(id)tableView objectValueForTableColumn:(CPTableColumn)aColumn row:(int)aRow +{ + return @"Row " + aRow; +} + +@end + +@implementation CPTableView (test) + +- (void)setHeaderView:(CPView)aHeaderView +{ + if (_headerView === aHeaderView) + return; + + [_headerView setTableView:nil]; + + _headerView = aHeaderView; + + if (_headerView) + { + [_headerView setTableView:self]; + [_headerView setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CGRectGetHeight([_headerView frame]))]; + } + else if (self === fixedTable) + { + // If there is no header view, there should be no corner view + [_cornerView removeFromSuperview]; + _cornerView = nil; + } + + var scrollView = [self enclosingScrollView]; + + if ([scrollView isKindOfClass:[CPScrollView class]] && [scrollView documentView] === self) + [scrollView _updateCornerAndHeaderView]; +} + +@end diff --git a/Tests/Manual/TableTest/HeaderView-CornerView/Info.plist b/Tests/Manual/TableTest/HeaderView-CornerView/Info.plist new file mode 100644 index 000000000..ef35fb10e --- /dev/null +++ b/Tests/Manual/TableTest/HeaderView-CornerView/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + HeaderView-CornerView + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/TableTest/HeaderView-CornerView/Jakefile b/Tests/Manual/TableTest/HeaderView-CornerView/Jakefile new file mode 100644 index 000000000..f420324ca --- /dev/null +++ b/Tests/Manual/TableTest/HeaderView-CornerView/Jakefile @@ -0,0 +1,93 @@ +/* + * Jakefile + * HeaderView-CornerView + * + * Created by aparajita on May 18, 2011. + * Copyright 2011, Victory-Heart Productions 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 ("HeaderViewCornerView", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "HeaderViewCornerView.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("HeaderView-CornerView"); + task.setIdentifier("com.aparajita.HeaderViewCornerView"); + task.setVersion("1.0"); + task.setAuthor("Victory-Heart Productions"); + task.setEmail("feedback @nospam@ yourcompany.com"); + task.setSummary("HeaderView-CornerView"); + 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", ["HeaderViewCornerView"], 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", "HeaderViewCornerView", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "HeaderViewCornerView", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "HeaderViewCornerView")); + OS.system(["press", "-f", FILE.join("Build", "Release", "HeaderViewCornerView"), FILE.join("Build", "Deployment", "HeaderViewCornerView")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "HeaderViewCornerView")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "HeaderViewCornerView"), FILE.join("Build", "Desktop", "HeaderViewCornerView", "HeaderViewCornerView.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "HeaderViewCornerView", "HeaderViewCornerView.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "HeaderViewCornerView")); + print("----------------------------"); +} diff --git a/Tests/Manual/TableTest/HeaderView-CornerView/Resources/spinner.gif b/Tests/Manual/TableTest/HeaderView-CornerView/Resources/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..06dbc2bc21dddcf0e09b566d5b211aee89570f52 GIT binary patch literal 1849 zcma*odr(tX9tZHtz31lM+(&Y`A`Ou`NeG&R#DrIfV%?hng21vs6v>ooRQQFbk7E_K!V( z{?5!fpZWgIZ%*d6t%i*j24bL}AZUJm9)h6R*;%L4IWse3G#VWaN1#$zSSXcBhlYlH zJ|D}n{r&w2f+Qp)SS*&n?*G4}{}!h?td_mjU6Kad-rW*QwWYCUk7d^e+sjpZAn6kT z5rM;`{~_}-wm+L@%+E;JphLm}C3WzQAQD0wBoY|rOTQX{(@pp-WAA8Iw0HKl|15j) zhGh(SFWu#5zUCw^T!}C~eC}~?{xG-r7ugQC>taC+|L^xr&a%{#cgUOZXIM&v?)k^2 z1i5%0!U00wq)r4vlAwXBA_m5J5WNeuBm-XJQ5pG4GD%vc|K){+TJ{AkHqN@SJKczX zU}QRd9n*_bf^h94)6Ctv{CUfz_;qs#RDuQ$DR%y1&5G-a6rhf*4Y zl+UOD1*GE{GQ7vv;c-tTIMkz0ovO>9j%b5hpa@a*CBJ#W!0@ndSwF|%hMkdFtXiU) z`BEp+yhkt8ZY>tg&uyH@%^%K4jDrbA;et&vnnzZ3z22@e6<27z2Vk13kb7OtISyxv z(XoO-LNQCZe3lfzc%*pNqU<9T+p~teThOEB+~e&U0mC|zS{Q)dJZ)!^1f7L(zg*L> z*vSW%?dR~@@0(}x6-V^A`~ImD;)NaBUnP8;RH=bS2@pk`wp>>8r&jGjmGPy%1BW}v zoPo}ca$~bze@efc3kapuEVW1!%teOZT3j2Tw5=hjiAf02d}7dL0oFC%@=RXp5Ow#% z@a>+AM|YWt$n&e`>sB-32gBcuTi>R>*|8@lp`y6thc7ydyqDsuUn~YzZf|{-R@-3y zL#wx{Ii}xxL_csiW*LBn0-A$>zp4WOmkf6=ilrjlW?-l9+bCd7|i?*b5NTmy<<6NZ0T8$SN@mwdC2f z6jqK=N@bS@!=YSj%>h0}*4p+%0HbTIrE$w7UMT6+AZZ&DAo*qZAAi(OtNbIfl#Dw^ zJWeiCp~zi#&t6x}m9)O^eR4HiLV3QA<<0>HZ8%$^lrSE94Wb}=+MM^!b>n#5&-JQR zkr-CEu9C;_F*7DqDisulV6Pmg$nFL0TPn%~*m^-`Z3^BgU(sNpnx%nW(!eV9A&FvI zHL3X3lw8Wji^6=8KbQDE-e%b?svdFxxdh$8r97@7$ojeI`6AL8Ob6QC$qh&>ZWVDX1F{0vJnT%%mE;GveKWR%C} zM&4d;Jf3s9|HAA)yVUPo`Aq;0do#)uHSXi5*QF*)x@MVVHr+cN)uMZ__F|&Ta#p8d z53TOKtce!PJUuie8UWol-S(`c2nH?UGqJP{!4RR4u$LCfn)q-hj0^f=h(VYy)T6eN zhRO!ja-aDBTcgeyP(8Ua4IdiOog^*CQa?R(cP#9AgL9`j>EX-6Yf1lzX(!~``M1XC zNmM<4<6d~wWZ$Xrk0K}UteTrq@LBBk#MsjkK;pbuVhe)NI7(7Pf(l?lxC7=1Z7Pzl zMbS;nV4NI5_N{1$P)&XC)huOGQ+h^zpYUZfb*1n6>!`#*b3y52LGmi+<4sY5jyD#- zw&$d}DTguLAfnRtjrM*JfqtHqUu6rQoU=g%1E9xk%;)TDm^2<8n-0IhTsQFaek)MY}>PK4;nBk=ow4pF>vzkO& gna%Org-kgQCf=+BeMi^RbuY;YE~rTjend;_cdi8t>i_@% literal 0 HcmV?d00001 diff --git a/Tests/Manual/TableTest/HeaderView-CornerView/index-debug.html b/Tests/Manual/TableTest/HeaderView-CornerView/index-debug.html new file mode 100644 index 000000000..613eeb492 --- /dev/null +++ b/Tests/Manual/TableTest/HeaderView-CornerView/index-debug.html @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + HeaderView-CornerView + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/TableTest/HeaderView-CornerView/index.html b/Tests/Manual/TableTest/HeaderView-CornerView/index.html new file mode 100644 index 000000000..e894fc5f0 --- /dev/null +++ b/Tests/Manual/TableTest/HeaderView-CornerView/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + HeaderView-CornerView + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/TableTest/HeaderView-CornerView/main.j b/Tests/Manual/TableTest/HeaderView-CornerView/main.j new file mode 100644 index 000000000..b202f5bf1 --- /dev/null +++ b/Tests/Manual/TableTest/HeaderView-CornerView/main.j @@ -0,0 +1,18 @@ +/* + * AppController.j + * HeaderView-CornerView + * + * Created by aparajita on May 18, 2011. + * Copyright 2011, Victory-Heart Productions All rights reserved. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}