From bafb23ae44dfeedbda4338ba5d60b998414ae6d4 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Sat, 9 Oct 2010 08:14:00 -0400 Subject: [PATCH] Allow ephemeral subviews to be created when the parent view has an empty frame, de-lint --- AppKit/CPView.j | 12 +- .../AppController.j | 160 ++++++++++++++++++ .../layoutEphemeralSubviewTest/Info.plist | 12 ++ .../layoutEphemeralSubviewTest/Jakefile | 92 ++++++++++ .../Resources/spinner.gif | Bin 0 -> 1849 bytes .../index-debug.html | 103 +++++++++++ .../layoutEphemeralSubviewTest/index.html | 78 +++++++++ .../Manual/layoutEphemeralSubviewTest/main.j | 17 ++ 8 files changed, 468 insertions(+), 6 deletions(-) create mode 100644 Tests/Manual/layoutEphemeralSubviewTest/AppController.j create mode 100644 Tests/Manual/layoutEphemeralSubviewTest/Info.plist create mode 100644 Tests/Manual/layoutEphemeralSubviewTest/Jakefile create mode 100644 Tests/Manual/layoutEphemeralSubviewTest/Resources/spinner.gif create mode 100644 Tests/Manual/layoutEphemeralSubviewTest/index-debug.html create mode 100644 Tests/Manual/layoutEphemeralSubviewTest/index.html create mode 100644 Tests/Manual/layoutEphemeralSubviewTest/main.j diff --git a/AppKit/CPView.j b/AppKit/CPView.j index 9b13084f0..68704a131 100644 --- a/AppKit/CPView.j +++ b/AppKit/CPView.j @@ -1003,7 +1003,7 @@ var CPViewFlags = { }, { var mask = [self autoresizingMask]; - if(mask == CPViewNotSizable) + if (mask == CPViewNotSizable) return; var frame = _superview._frame, @@ -1159,7 +1159,7 @@ var CPViewFlags = { }, { aFlag = !!aFlag; - if(_isHidden === aFlag) + if (_isHidden === aFlag) return; // FIXME: Should we return to visibility? This breaks in FireFox, Opera, and IE. @@ -1351,7 +1351,7 @@ var CPViewFlags = { }, */ - (CPView)hitTest:(CPPoint)aPoint { - if(_isHidden || !_hitTests || !CPRectContainsPoint(_frame, aPoint)) + if (_isHidden || !_hitTests || !CPRectContainsPoint(_frame, aPoint)) return nil; var view = nil, @@ -1959,7 +1959,7 @@ setBoundsOrigin: var superview = _superview, clipViewClass = [CPClipView class]; - while(superview && ![superview isKindOfClass:clipViewClass]) + while (superview && ![superview isKindOfClass:clipViewClass]) superview = superview._superview; return superview; @@ -2055,7 +2055,7 @@ setBoundsOrigin: var superview = _superview, scrollViewClass = [CPScrollView class]; - while(superview && ![superview isKindOfClass:scrollViewClass]) + while (superview && ![superview isKindOfClass:scrollViewClass]) superview = superview._superview; return superview; @@ -2454,7 +2454,7 @@ setBoundsOrigin: var frame = [self rectForEphemeralSubviewNamed:aViewName]; - if (frame && !_CGRectIsEmpty(frame)) + if (frame) { if (!_ephemeralSubviewsForNames[aViewName]) { diff --git a/Tests/Manual/layoutEphemeralSubviewTest/AppController.j b/Tests/Manual/layoutEphemeralSubviewTest/AppController.j new file mode 100644 index 000000000..14932a323 --- /dev/null +++ b/Tests/Manual/layoutEphemeralSubviewTest/AppController.j @@ -0,0 +1,160 @@ +/* + * AppController.j + * layoutEphemeralSubviewTest + * + * Created by Aparajita Fishman on October 8, 2010. + */ + +@import + + +@implementation AppController : CPObject +{ +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0, 0, 300, 250) styleMask:CPTitledWindowMask], + contentView = [theWindow contentView], + radio = [[OldRadio alloc] initWithFrame:CGRectMakeZero()]; + + [theWindow center]; + [theWindow setTitle:@"layoutEphemeralSubview Test"]; + + var label = [[CPTextField alloc] initWithFrame:CGRectMake(15, 15, 270, 80)]; + + [label setLineBreakMode:CPLineBreakByWordWrapping]; + [label setStringValue:@"These checkboxes and radio buttons were created with an empty frame, then sized to fit. " + + @"Notice that the ones with the old code truncate the image, whereas the ones made with " + + @"the new code size correctly."]; + [label setFrameOrigin:CGPointMake(15, 20)]; + [contentView addSubview:label]; + + label = [CPTextField labelWithTitle:@"Old code:"]; + [label setFrameOrigin:CGPointMake(15, 120)]; + [contentView addSubview:label]; + + var checkbox = [[OldCheckBox alloc] initWithFrame:CGRectMakeZero()]; + + [checkbox sizeToFit]; + [checkbox setFrameOrigin:CGPointMake(CGRectGetMaxX([label frame]) + 5, CGRectGetMinY([label frame]))]; + [contentView addSubview:checkbox]; + + label = [CPTextField labelWithTitle:@"New code:"], + [label setFrameOrigin:CGPointMake(15, CGRectGetMaxY([checkbox frame]) + 10)]; + [contentView addSubview:label]; + + checkbox = [[CPCheckBox alloc] initWithFrame:CGRectMakeZero()]; + [checkbox sizeToFit]; + [checkbox setFrameOrigin:CGPointMake(CGRectGetMaxX([label frame]) + 5, CGRectGetMinY([label frame]))]; + [contentView addSubview:checkbox]; + + label = [CPTextField labelWithTitle:@"Old code:"]; + [label setFrameOrigin:CGPointMake(15, CGRectGetMaxY([checkbox frame]) + 10)]; + [contentView addSubview:label]; + + var radio = [[OldRadio alloc] initWithFrame:CGRectMakeZero()]; + + [radio sizeToFit]; + [radio setFrameOrigin:CGPointMake(CGRectGetMaxX([label frame]) + 5, CGRectGetMinY([label frame]))]; + [contentView addSubview:radio]; + + label = [CPTextField labelWithTitle:@"New code:"], + [label setFrameOrigin:CGPointMake(15, CGRectGetMaxY([radio frame]) + 10)]; + [contentView addSubview:label]; + + radio = [[CPRadio alloc] initWithFrame:CGRectMakeZero()]; + [radio sizeToFit]; + [radio setFrameOrigin:CGPointMake(CGRectGetMaxX([label frame]) + 5, CGRectGetMinY([label frame]))]; + [contentView addSubview:radio]; + + [theWindow orderFront:self]; +} + +@end + + +@implementation OldCheckBox : CPCheckBox + +- (CPView)layoutEphemeralSubviewNamed:(CPString)aViewName + positioned:(CPWindowOrderingMode)anOrderingMode + relativeToEphemeralSubviewNamed:(CPString)relativeToViewName +{ + if (!_ephemeralSubviewsForNames) + { + _ephemeralSubviewsForNames = {}; + _ephemeralSubviews = [CPSet set]; + } + + var frame = [self rectForEphemeralSubviewNamed:aViewName]; + + if (frame && !CGRectIsEmpty(frame)) + { + if (!_ephemeralSubviewsForNames[aViewName]) + { + _ephemeralSubviewsForNames[aViewName] = [self createEphemeralSubviewNamed:aViewName]; + + [_ephemeralSubviews addObject:_ephemeralSubviewsForNames[aViewName]]; + + if (_ephemeralSubviewsForNames[aViewName]) + [self addSubview:_ephemeralSubviewsForNames[aViewName] positioned:anOrderingMode relativeTo:_ephemeralSubviewsForNames[relativeToViewName]]; + } + + if (_ephemeralSubviewsForNames[aViewName]) + [_ephemeralSubviewsForNames[aViewName] setFrame:frame]; + } + else if (_ephemeralSubviewsForNames[aViewName]) + { + [_ephemeralSubviewsForNames[aViewName] removeFromSuperview]; + + [_ephemeralSubviews removeObject:_ephemeralSubviewsForNames[aViewName]]; + delete _ephemeralSubviewsForNames[aViewName]; + } + + return _ephemeralSubviewsForNames[aViewName]; +} + +@end + + +@implementation OldRadio : CPRadio + +- (CPView)layoutEphemeralSubviewNamed:(CPString)aViewName + positioned:(CPWindowOrderingMode)anOrderingMode + relativeToEphemeralSubviewNamed:(CPString)relativeToViewName +{ + if (!_ephemeralSubviewsForNames) + { + _ephemeralSubviewsForNames = {}; + _ephemeralSubviews = [CPSet set]; + } + + var frame = [self rectForEphemeralSubviewNamed:aViewName]; + + if (frame && !CGRectIsEmpty(frame)) + { + if (!_ephemeralSubviewsForNames[aViewName]) + { + _ephemeralSubviewsForNames[aViewName] = [self createEphemeralSubviewNamed:aViewName]; + + [_ephemeralSubviews addObject:_ephemeralSubviewsForNames[aViewName]]; + + if (_ephemeralSubviewsForNames[aViewName]) + [self addSubview:_ephemeralSubviewsForNames[aViewName] positioned:anOrderingMode relativeTo:_ephemeralSubviewsForNames[relativeToViewName]]; + } + + if (_ephemeralSubviewsForNames[aViewName]) + [_ephemeralSubviewsForNames[aViewName] setFrame:frame]; + } + else if (_ephemeralSubviewsForNames[aViewName]) + { + [_ephemeralSubviewsForNames[aViewName] removeFromSuperview]; + + [_ephemeralSubviews removeObject:_ephemeralSubviewsForNames[aViewName]]; + delete _ephemeralSubviewsForNames[aViewName]; + } + + return _ephemeralSubviewsForNames[aViewName]; +} + +@end diff --git a/Tests/Manual/layoutEphemeralSubviewTest/Info.plist b/Tests/Manual/layoutEphemeralSubviewTest/Info.plist new file mode 100644 index 000000000..162e3e867 --- /dev/null +++ b/Tests/Manual/layoutEphemeralSubviewTest/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + layoutEphemeralSubviewTest + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/layoutEphemeralSubviewTest/Jakefile b/Tests/Manual/layoutEphemeralSubviewTest/Jakefile new file mode 100644 index 000000000..ed17fe26b --- /dev/null +++ b/Tests/Manual/layoutEphemeralSubviewTest/Jakefile @@ -0,0 +1,92 @@ +/* + * Jakefile + * layoutEphemeralSubviewTest + * + * Created by Aparajita Fishman on October 8, 2010. + */ + +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 ("layoutEphemeralSubviewTest", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "layoutEphemeralSubviewTest.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("layoutEphemeralSubviewTest"); + task.setIdentifier("com.yourcompany.layoutEphemeralSubviewTest"); + task.setVersion("1.0"); + task.setAuthor("WireLoad, LLC"); + task.setEmail("feedback @nospam@ yourcompany.com"); + task.setSummary("layoutEphemeralSubviewTest"); + 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", ["layoutEphemeralSubviewTest"], 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", "layoutEphemeralSubviewTest", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "layoutEphemeralSubviewTest", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "layoutEphemeralSubviewTest")); + OS.system(["press", "-f", FILE.join("Build", "Release", "layoutEphemeralSubviewTest"), FILE.join("Build", "Deployment", "layoutEphemeralSubviewTest")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "layoutEphemeralSubviewTest")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "layoutEphemeralSubviewTest"), FILE.join("Build", "Desktop", "layoutEphemeralSubviewTest", "layoutEphemeralSubviewTest.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "layoutEphemeralSubviewTest", "layoutEphemeralSubviewTest.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "layoutEphemeralSubviewTest")); + print("----------------------------"); +} diff --git a/Tests/Manual/layoutEphemeralSubviewTest/Resources/spinner.gif b/Tests/Manual/layoutEphemeralSubviewTest/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/layoutEphemeralSubviewTest/index-debug.html b/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html new file mode 100644 index 000000000..e6325d134 --- /dev/null +++ b/Tests/Manual/layoutEphemeralSubviewTest/index-debug.html @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + layoutEphemeralSubview Test + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/layoutEphemeralSubviewTest/index.html b/Tests/Manual/layoutEphemeralSubviewTest/index.html new file mode 100644 index 000000000..981d62c6a --- /dev/null +++ b/Tests/Manual/layoutEphemeralSubviewTest/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + layoutEphemeralSubview Test + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/layoutEphemeralSubviewTest/main.j b/Tests/Manual/layoutEphemeralSubviewTest/main.j new file mode 100644 index 000000000..ceb0a5ee0 --- /dev/null +++ b/Tests/Manual/layoutEphemeralSubviewTest/main.j @@ -0,0 +1,17 @@ +/* + * AppController.j + * layoutEphemeralSubviewTest + * + * Created by Aparajita Fishman on October 8, 2010. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +}