From 86079af3b138c76697ba7bb6469b7bd2e69127f8 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Wed, 26 Oct 2011 11:05:07 +0200 Subject: [PATCH 1/3] implement CPWindow setMovable: API. close #1358 --- AppKit/CPWindow/CPWindow.j | 19 +++++++++++++++++++ AppKit/CPWindow/_CPWindowView.j | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j index 933e03c90..b0542a14e 100644 --- a/AppKit/CPWindow/CPWindow.j +++ b/AppKit/CPWindow/CPWindow.j @@ -271,6 +271,7 @@ var CPWindowActionMessageKeys = [ BOOL _isAnimating; BOOL _hasShadow; BOOL _isMovableByWindowBackground; + BOOL _isMovable; unsigned _shadowStyle; BOOL _showsResizeIndicator; @@ -404,6 +405,7 @@ CPTexturedBackgroundWindowMask _registeredDraggedTypesArray = []; _isSheet = NO; _acceptsMouseMovedEvents = YES; + _isMovable = YES; // Set up our window number. _windowNumber = [CPApp._windows count]; @@ -1438,6 +1440,23 @@ CPTexturedBackgroundWindowMask return _isMovableByWindowBackground; } +/*! + Sets whether the window can be moved. + @param shouldBeMovable \c YES makes the window movable. +*/ +- (void)setMovable:(BOOL)shouldBeMovable +{ + _isMovable = shouldBeMovable; +} + +/*! + Returns \c YES if the window can be moved. +*/ +- (void)isMovable +{ + return _isMovable; +} + /*! Sets the window location to be the center of the screen */ diff --git a/AppKit/CPWindow/_CPWindowView.j b/AppKit/CPWindow/_CPWindowView.j index 6a9f62894..ffeaad082 100644 --- a/AppKit/CPWindow/_CPWindowView.j +++ b/AppKit/CPWindow/_CPWindowView.j @@ -111,7 +111,7 @@ var _CPWindowViewResizeIndicatorImage = nil; return [self trackResizeWithEvent:anEvent]; } - if ([theWindow isMovableByWindowBackground]) + if ([theWindow isMovable] && [theWindow isMovableByWindowBackground]) [self trackMoveWithEvent:anEvent]; else @@ -174,6 +174,9 @@ var _CPWindowViewResizeIndicatorImage = nil; - (void)trackMoveWithEvent:(CPEvent)anEvent { + if (![[self window] isMovable]) + return; + var type = [anEvent type]; if (type === CPLeftMouseUp) From 444c30e3894183e07e6b552f965620bbd5713737 Mon Sep 17 00:00:00 2001 From: Antoine Mercadal Date: Fri, 28 Oct 2011 17:56:37 +0200 Subject: [PATCH 2/3] add manual test case --- .../CPWindowMovableTest/AppController.j | 59 ++++++++++ Tests/Manual/CPWindowMovableTest/Info.plist | 12 ++ Tests/Manual/CPWindowMovableTest/Jakefile | 93 ++++++++++++++++ .../CPWindowMovableTest/Resources/spinner.gif | Bin 0 -> 1849 bytes .../CPWindowMovableTest/index-debug.html | 103 ++++++++++++++++++ Tests/Manual/CPWindowMovableTest/index.html | 78 +++++++++++++ Tests/Manual/CPWindowMovableTest/main.j | 18 +++ 7 files changed, 363 insertions(+) create mode 100644 Tests/Manual/CPWindowMovableTest/AppController.j create mode 100644 Tests/Manual/CPWindowMovableTest/Info.plist create mode 100644 Tests/Manual/CPWindowMovableTest/Jakefile create mode 100644 Tests/Manual/CPWindowMovableTest/Resources/spinner.gif create mode 100644 Tests/Manual/CPWindowMovableTest/index-debug.html create mode 100644 Tests/Manual/CPWindowMovableTest/index.html create mode 100644 Tests/Manual/CPWindowMovableTest/main.j diff --git a/Tests/Manual/CPWindowMovableTest/AppController.j b/Tests/Manual/CPWindowMovableTest/AppController.j new file mode 100644 index 000000000..24848412b --- /dev/null +++ b/Tests/Manual/CPWindowMovableTest/AppController.j @@ -0,0 +1,59 @@ +/* + * AppController.j + * CPWindowMovableTest + * + * Created by You on October 28, 2011. + * Copyright 2011, Your Company All rights reserved. + */ + +@import + + +@implementation AppController : CPObject +{ + CPWindow aWindow; +} + +- (void)applicationDidFinishLaunching:(CPNotification)aNotification +{ + var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask], + contentView = [theWindow contentView]; + + + var button = [CPButton buttonWithTitle:@"Set movable by background"]; + + [button setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin | CPViewMinYMargin | CPViewMaxYMargin]; + [button setFrameOrigin:CPPointMake(10, 10)]; + [button setTarget:self]; + [button setAction:@selector(swicthMovableByBackground:)] + [contentView addSubview:button]; + + + var button2 = [CPButton buttonWithTitle:@"Switch movable"]; + + [button2 setFrameOrigin:CPPointMake(200, 10)]; + [button2 setTarget:self]; + [button2 setAction:@selector(swicthMovable:)] + [contentView addSubview:button2]; + + [theWindow orderFront:self]; + + aWindow = [[CPWindow alloc] initWithContentRect:CPRectMake(0, 0, 200, 200) styleMask:CPTitledWindowMask]; + [aWindow setTitle:@"Move me!"]; + [aWindow center]; + [aWindow makeKeyAndOrderFront:self]; +} + + +- (IBAction)swicthMovableByBackground:(id)aSender +{ + [aWindow setMovableByWindowBackground:![aWindow isMovableByWindowBackground]]; +} + +- (IBAction)swicthMovable:(id)aSender +{ + [aWindow setMovable:![aWindow isMovable]]; +} + + +@end diff --git a/Tests/Manual/CPWindowMovableTest/Info.plist b/Tests/Manual/CPWindowMovableTest/Info.plist new file mode 100644 index 000000000..a0ae7cc67 --- /dev/null +++ b/Tests/Manual/CPWindowMovableTest/Info.plist @@ -0,0 +1,12 @@ + + + + + CPApplicationDelegateClass + AppController + CPBundleName + CPWindowMovableTest + CPPrincipalClass + CPApplication + + diff --git a/Tests/Manual/CPWindowMovableTest/Jakefile b/Tests/Manual/CPWindowMovableTest/Jakefile new file mode 100644 index 000000000..8ca955d00 --- /dev/null +++ b/Tests/Manual/CPWindowMovableTest/Jakefile @@ -0,0 +1,93 @@ +/* + * Jakefile + * CPWindowMovableTest + * + * Created by You on October 28, 2011. + * Copyright 2011, 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 ("CPWindowMovableTest", function(task) +{ + task.setBuildIntermediatesPath(FILE.join("Build", "CPWindowMovableTest.build", configuration)); + task.setBuildPath(FILE.join("Build", configuration)); + + task.setProductName("CPWindowMovableTest"); + task.setIdentifier("com.yourcompany.CPWindowMovableTest"); + task.setVersion("1.0"); + task.setAuthor("Your Company"); + task.setEmail("feedback @nospam@ yourcompany.com"); + task.setSummary("CPWindowMovableTest"); + 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", ["CPWindowMovableTest"], 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", "CPWindowMovableTest", "index.html")]); +}); + +task ("run-release", ["release"], function() +{ + OS.system(["open", FILE.join("Build", "Release", "CPWindowMovableTest", "index.html")]); +}); + +task ("deploy", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Deployment", "CPWindowMovableTest")); + OS.system(["press", "-f", FILE.join("Build", "Release", "CPWindowMovableTest"), FILE.join("Build", "Deployment", "CPWindowMovableTest")]); + printResults("Deployment") +}); + +task ("desktop", ["release"], function() +{ + FILE.mkdirs(FILE.join("Build", "Desktop", "CPWindowMovableTest")); + require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPWindowMovableTest"), FILE.join("Build", "Desktop", "CPWindowMovableTest", "CPWindowMovableTest.app")); + printResults("Desktop") +}); + +task ("run-desktop", ["desktop"], function() +{ + OS.system([FILE.join("Build", "Desktop", "CPWindowMovableTest", "CPWindowMovableTest.app", "Contents", "MacOS", "NativeHost"), "-i"]); +}); + +function printResults(configuration) +{ + print("----------------------------"); + print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPWindowMovableTest")); + print("----------------------------"); +} diff --git a/Tests/Manual/CPWindowMovableTest/Resources/spinner.gif b/Tests/Manual/CPWindowMovableTest/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/CPWindowMovableTest/index-debug.html b/Tests/Manual/CPWindowMovableTest/index-debug.html new file mode 100644 index 000000000..048300db6 --- /dev/null +++ b/Tests/Manual/CPWindowMovableTest/index-debug.html @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + CPWindowMovableTest + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + diff --git a/Tests/Manual/CPWindowMovableTest/index.html b/Tests/Manual/CPWindowMovableTest/index.html new file mode 100644 index 000000000..0fcbd5fd4 --- /dev/null +++ b/Tests/Manual/CPWindowMovableTest/index.html @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + CPWindowMovableTest + + + + + + + + + + + + +
+
+ + + +
+
+ + + + diff --git a/Tests/Manual/CPWindowMovableTest/main.j b/Tests/Manual/CPWindowMovableTest/main.j new file mode 100644 index 000000000..9c4c247e4 --- /dev/null +++ b/Tests/Manual/CPWindowMovableTest/main.j @@ -0,0 +1,18 @@ +/* + * AppController.j + * CPWindowMovableTest + * + * Created by You on October 28, 2011. + * Copyright 2011, Your Company All rights reserved. + */ + +@import +@import + +@import "AppController.j" + + +function main(args, namedArgs) +{ + CPApplicationMain(args, namedArgs); +} From b7e41894affbe35be525277f4a3a559d8e9fe056 Mon Sep 17 00:00:00 2001 From: Aparajita Fishman Date: Mon, 31 Oct 2011 12:39:53 -0700 Subject: [PATCH 3/3] fixed up the test app ui --- .../CPWindowMovableTest/AppController.j | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/Tests/Manual/CPWindowMovableTest/AppController.j b/Tests/Manual/CPWindowMovableTest/AppController.j index 24848412b..2599b1e02 100644 --- a/Tests/Manual/CPWindowMovableTest/AppController.j +++ b/Tests/Manual/CPWindowMovableTest/AppController.j @@ -12,6 +12,8 @@ @implementation AppController : CPObject { CPWindow aWindow; + CPCheckBox backgroundMovableCB; + CPCheckBox movableCB; } - (void)applicationDidFinishLaunching:(CPNotification)aNotification @@ -20,21 +22,19 @@ contentView = [theWindow contentView]; - var button = [CPButton buttonWithTitle:@"Set movable by background"]; + backgroundMovableCB = [CPCheckBox checkBoxWithTitle:@"Movable by background"]; - [button setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin | CPViewMinYMargin | CPViewMaxYMargin]; - [button setFrameOrigin:CPPointMake(10, 10)]; - [button setTarget:self]; - [button setAction:@selector(swicthMovableByBackground:)] - [contentView addSubview:button]; + [backgroundMovableCB setFrameOrigin:CPPointMake(10, 10)]; + [backgroundMovableCB setTarget:self]; + [backgroundMovableCB setAction:@selector(setMovableByBackground:)] + [contentView addSubview:backgroundMovableCB]; + movableCB = [CPCheckBox checkBoxWithTitle:@"Movable"]; - var button2 = [CPButton buttonWithTitle:@"Switch movable"]; - - [button2 setFrameOrigin:CPPointMake(200, 10)]; - [button2 setTarget:self]; - [button2 setAction:@selector(swicthMovable:)] - [contentView addSubview:button2]; + [movableCB setFrameOrigin:CPPointMake(200, 10)]; + [movableCB setTarget:self]; + [movableCB setAction:@selector(setMovable:)] + [contentView addSubview:movableCB]; [theWindow orderFront:self]; @@ -42,17 +42,21 @@ [aWindow setTitle:@"Move me!"]; [aWindow center]; [aWindow makeKeyAndOrderFront:self]; + + [backgroundMovableCB setState:[aWindow isMovableByWindowBackground]]; + [movableCB setState:[aWindow isMovable]]; + [backgroundMovableCB setEnabled:[aWindow isMovable]]; } - -- (IBAction)swicthMovableByBackground:(id)aSender +- (IBAction)setMovableByBackground:(id)aSender { - [aWindow setMovableByWindowBackground:![aWindow isMovableByWindowBackground]]; + [aWindow setMovableByWindowBackground:[aSender state] === CPOnState]; } -- (IBAction)swicthMovable:(id)aSender +- (IBAction)setMovable:(id)aSender { - [aWindow setMovable:![aWindow isMovable]]; + [aWindow setMovable:[aSender state] === CPOnState]; + [backgroundMovableCB setEnabled:[aWindow isMovable]]; }