diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj index 3c6ad2d16..d74a00d53 100644 --- a/Frameworks/AppKit/Browser.environment/AppKit.sj +++ b/Frameworks/AppKit/Browser.environment/AppKit.sj @@ -40013,7 +40013,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_ ,["void","CPCoder"])]); } -p;13;CPTextField.jt;130515;@STATIC;1.0;i;11;CPControl.ji;17;CPStringDrawing.ji;17;CPCompatibility.ji;8;CPText.ji;20;CPWindow_Constants.ji;21;_CPImageAndTextView.jt;130371;objj_executeFile("CPControl.j", YES);objj_executeFile("CPStringDrawing.j", YES);objj_executeFile("CPCompatibility.j", YES);objj_executeFile("CPText.j", YES);objj_executeFile("CPWindow_Constants.j", YES);objj_executeFile("_CPImageAndTextView.j", YES);{var the_protocol = objj_allocateProtocol("CPTextFieldDelegate"); +p;13;CPTextField.jt;133054;@STATIC;1.0;i;11;CPControl.ji;17;CPStringDrawing.ji;17;CPCompatibility.ji;8;CPText.ji;20;CPWindow_Constants.ji;21;_CPImageAndTextView.jt;132910;objj_executeFile("CPControl.j", YES);objj_executeFile("CPStringDrawing.j", YES);objj_executeFile("CPCompatibility.j", YES);objj_executeFile("CPText.j", YES);objj_executeFile("CPWindow_Constants.j", YES);objj_executeFile("_CPImageAndTextView.j", YES);{var the_protocol = objj_allocateProtocol("CPTextFieldDelegate"); var aProtocol = objj_getProtocol("CPControlTextEditingDelegate"); if (!aProtocol) throw new SyntaxError("*** Could not find definition for protocol \"CPTextFieldDelegate\""); protocol_addProtocol(the_protocol, aProtocol); @@ -41325,7 +41325,26 @@ default: (self.isa.method_msgSend["_setCSSStyleForInputElement"] || _objj_forward)(self, "_setCSSStyleForInputElement"); } -,["void"]), new objj_method(sel_getUid("takeValueFromKeyPath:ofObjects:"), function $CPTextField__takeValueFromKeyPath_ofObjects_(self, _cmd, aKeyPath, objects) +,["void"]), new objj_method(sel_getUid("setFont:"), function $CPTextField__setFont_(self, _cmd, aFont) +{ + if ((self.isa.method_msgSend["currentValueForThemeAttribute:"] || _objj_forward)(self, "currentValueForThemeAttribute:", "font") === aFont) + return; + (self.isa.method_msgSend["setValue:forThemeAttribute:"] || _objj_forward)(self, "setValue:forThemeAttribute:", aFont, "font"); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateEditing); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateBezeled); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateBordered); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPTextFieldStateRounded); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", [CPTextFieldStateRounded, CPThemeStateEditing]); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateControlSizeRegular); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateControlSizeSmall); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateControlSizeMini); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateTableDataView); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", [CPThemeStateTableDataView, CPThemeStateSelectedDataView]); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", [CPThemeStateTableDataView, CPThemeStateSelectedDataView, CPThemeStateFirstResponder, CPThemeStateKeyWindow]); + (self.isa.method_msgSend["layoutSubviews"] || _objj_forward)(self, "layoutSubviews"); +} + +,["void","CPFont"]), new objj_method(sel_getUid("takeValueFromKeyPath:ofObjects:"), function $CPTextField__takeValueFromKeyPath_ofObjects_(self, _cmd, aKeyPath, objects) { var count = objects.length, value = ((___r1 = objects[0]), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["valueForKeyPath:"] || _objj_forward)(___r1, "valueForKeyPath:", aKeyPath)); diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj index a35fbb6a2..ac05c66c4 100644 --- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj +++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj @@ -39147,7 +39147,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_ ,["void","CPCoder"])]); } -p;13;CPTextField.jt;106705;@STATIC;1.0;i;11;CPControl.ji;17;CPStringDrawing.ji;17;CPCompatibility.ji;8;CPText.ji;20;CPWindow_Constants.ji;21;_CPImageAndTextView.jt;106561;objj_executeFile("CPControl.j", YES);objj_executeFile("CPStringDrawing.j", YES);objj_executeFile("CPCompatibility.j", YES);objj_executeFile("CPText.j", YES);objj_executeFile("CPWindow_Constants.j", YES);objj_executeFile("_CPImageAndTextView.j", YES);{var the_protocol = objj_allocateProtocol("CPTextFieldDelegate"); +p;13;CPTextField.jt;109244;@STATIC;1.0;i;11;CPControl.ji;17;CPStringDrawing.ji;17;CPCompatibility.ji;8;CPText.ji;20;CPWindow_Constants.ji;21;_CPImageAndTextView.jt;109100;objj_executeFile("CPControl.j", YES);objj_executeFile("CPStringDrawing.j", YES);objj_executeFile("CPCompatibility.j", YES);objj_executeFile("CPText.j", YES);objj_executeFile("CPWindow_Constants.j", YES);objj_executeFile("_CPImageAndTextView.j", YES);{var the_protocol = objj_allocateProtocol("CPTextFieldDelegate"); var aProtocol = objj_getProtocol("CPControlTextEditingDelegate"); if (!aProtocol) throw new SyntaxError("*** Could not find definition for protocol \"CPTextFieldDelegate\""); protocol_addProtocol(the_protocol, aProtocol); @@ -40118,7 +40118,26 @@ class_addMethods(the_class, [new objj_method(sel_getUid("setControlSize:"), func (self.isa.method_msgSend["_setCSSStyleForInputElement"] || _objj_forward)(self, "_setCSSStyleForInputElement"); } -,["void"]), new objj_method(sel_getUid("takeValueFromKeyPath:ofObjects:"), function $CPTextField__takeValueFromKeyPath_ofObjects_(self, _cmd, aKeyPath, objects) +,["void"]), new objj_method(sel_getUid("setFont:"), function $CPTextField__setFont_(self, _cmd, aFont) +{ + if ((self.isa.method_msgSend["currentValueForThemeAttribute:"] || _objj_forward)(self, "currentValueForThemeAttribute:", "font") === aFont) + return; + (self.isa.method_msgSend["setValue:forThemeAttribute:"] || _objj_forward)(self, "setValue:forThemeAttribute:", aFont, "font"); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateEditing); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateBezeled); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateBordered); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPTextFieldStateRounded); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", [CPTextFieldStateRounded, CPThemeStateEditing]); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateControlSizeRegular); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateControlSizeSmall); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateControlSizeMini); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", CPThemeStateTableDataView); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", [CPThemeStateTableDataView, CPThemeStateSelectedDataView]); + (self.isa.method_msgSend["setValue:forThemeAttribute:inState:"] || _objj_forward)(self, "setValue:forThemeAttribute:inState:", aFont, "font", [CPThemeStateTableDataView, CPThemeStateSelectedDataView, CPThemeStateFirstResponder, CPThemeStateKeyWindow]); + (self.isa.method_msgSend["layoutSubviews"] || _objj_forward)(self, "layoutSubviews"); +} + +,["void","CPFont"]), new objj_method(sel_getUid("takeValueFromKeyPath:ofObjects:"), function $CPTextField__takeValueFromKeyPath_ofObjects_(self, _cmd, aKeyPath, objects) { var count = objects.length, value = ((___r1 = objects[0]), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["valueForKeyPath:"] || _objj_forward)(___r1, "valueForKeyPath:", aKeyPath)); diff --git a/Resources/recipes.txt b/Resources/recipes.txt index e656ac955..cfc061e48 100644 --- a/Resources/recipes.txt +++ b/Resources/recipes.txt @@ -1,146 +1,146 @@ -1781358435012|ArrayController1| -1781358435026|ArrayControllerInitialSelectionTest| -1781358435040|ArrayControllerRemovingFirstTest| -1781358435053|AttachedSheet| -1781358435067|AttachedSheet2| -1781358435081|Bindings| -1781358435095|CGCanvasContext| -1781358435108|CGPath| -1781358435122|CPAlertTest| -1781358435135|CPAnimatablePropertyContainerTest| -1781358435149|CPAnimationContextTest| -1781358435163|CPAnimationTest| -1781358435176|CPBinder-echo-bug| -1781358435190|CPBoxCibTest| -1781358435204|CPBoxTest| -1781358435218|CPBrowserTest| -1781358435231|CPButtonBarTest| -1781358435246|CPButtonKeyEquivalentDefaultTest| -1781358435259|CPButtonTest| -1781358435273|CPByteCountFormatter| -1781358435287|CPCollectionViewNibTest| -1781358435301|CPColor-CPImage-description| -1781358435315|CPColorWellBindings| -1781358435329|CPComboBoxTest| -1781358435343|CPControlPerformClickExceptionTest| -1781358435356|CPControlSize| -1781358435370|CPCursor| -1781358435384|CPDateFormatterTest| -1781358435398|CPDatePickerTest| -1781358435411|CPDictionaryControllerTest| -1781358435425|CPDocumentControllerTest| -1781358435438|CPFormatterTest| -1781358435452|CPGraphicsTest| -1781358435466|CPImageAndTextViewImageScaling| -1781358435479|CPImageViewAlignmentScaling| -1781358435493|CPImageViewTest| -1781358435507|CPImageViewbindingsTest| -1781358435520|CPLevelIndicator| -1781358435534|CPLocalizationTest| -1781358435547|CPLogTest| -1781358435561|CPMenuCALayerTest| -1781358435575|CPMenuEnabledBindingsTest| -1781358435589|CPMenuKeyEquivalents| -1781358435602|CPMenuRemoveAllTest| -1781358435616|CPMenuSubmenuPlacementConstraints| -1781358435629|CPMenuTest| -1781358435643|CPOutlineViewCibTest| -1781358435657|CPOutlineViewTest| -1781358435670|CPOutlineViewViewBasedCibTest| -1781358435684|CPPanelTest| -1781358435698|CPPlatformWindow| -1781358435711|CPPlattformWindowMinSize| -1781358435725|CPPopUpButtonBindings| -1781358435739|CPPopUpButtonTest| -1781358435752|CPPopover| -1781358435766|CPPredicateEditorCibTest| -1781358435780|CPProgressIndicator| -1781358435793|CPPropertyListSerializationTest| -1781358435807|CPRadioBindings| -1781358435821|CPRuleEditorCibTest| -1781358435834|CPRuleEditorTestI8N| -1781358435848|CPScrollView| -1781358435862|CPScrollView2| -1781358435875|CPSearchField| -1781358435889|CPSearchFieldPredicateBinding| -1781358435903|CPSegmentedControlBindings| -1781358435916|CPSegmentedControlTest| -1781358435930|CPSoundTest| -1781358435943|CPSplitViewDivider| -1781358435957|CPSplitViewTest| -1781358435971|CPStackViewTest| -1781358435984|CPStepperBindings| -1781358435998|CPStepperNibTest| -1781358436012|CPTabView2| -1781358436025|CPTabViewBindings| -1781358436039|CPTabViewNib| -1781358436053|CPTableViewGroupRows| -1781358436066|CPTextField| -1781358436080|CPTextFieldEditingStyleTest| -1781358436094|CPTextFieldHeightTest| -1781358436107|CPTextFieldMovementsTest| -1781358436121|CPTextFieldMultiline| -1781358436135|CPTextView| -1781358436148|CPTextViewCibTest| -1781358436162|CPTextViewDelegateAndNotifications| -1781358436176|CPTimeZone| -1781358436189|CPTokenFieldTest| -1781358436203|CPToolTip| -1781358436217|CPToolbarTest| -1781358436230|CPTreeControllerTest| -1781358436244|CPURLConnectionAsyncTest| -1781358436258|CPURLConnectionSynchronousTest| -1781358436271|CPUserDefaults| -1781358436285|CPUserDefaultsControllerTest| -1781358436299|CPUserNotificationTest| -1781358436312|CPViewController| -1781358436326|CPVisualEffectViewTest| -1781358436340|CPWebViewTest| -1781358436353|CPWebViewTest2| -1781358436367|CPWindowLiveResizeTest| -1781358436381|CPWindowMovableTest| -1781358436394|CPWindowResizeStyle| -1781358436408|ChildWindows| -1781358436422|CompilationTests| -1781358436435|ContinuouslyUpdatesValueBinding| -1781358436449|CopyAndPaste| -1781358436463|CrossOriginTest| -1781358436476|FF4096Test| -1781358436490|FontEnhancementTest| -1781358436504|FontMetricsExplorer| -1781358436517|KeyEquivalents| -1781358436531|KeyViewLoopTest| -1781358436544|KeyWindowInTheBackgroundActivation| -1781358436558|LayoutTest| -1781358436572|LoadTimeTest| -1781358436585|LongBindings| -1781358436599|MobileTest| -1781358436613|MultipleValueBindings| -1781358436626|NSBoxTest| -1781358436640|NSBrowserTest| -1781358436654|NewTextFieldBezel| -1781358436667|Nib2CibAlignment| -1781358436681|Nib2CibBaselineAlignementTest| -1781358436695|Nib2CibSubviewsOrderTest| -1781358436708|NibAppRemixed| -1781358436722|PatternFillTest| -1781358436736|PlatformWindows| -1781358436750|PopUpButtonEscTest| -1781358436764|ScalingTest| -1781358436778|ScalingTest2| -1781358436791|ScrollviewTheming| -1781358436805|SheetWindowOrderFrontIssue| -1781358436819|SimpleBindings2| -1781358436833|SmartFoldersDemo| -1781358436846|TableTest| -1781358436860|ThemeBrowser| -1781358436873|ThemeKitchenSink| -1781358436887|TrackingArea| -1781358436901|UndoRedoWithMenuUpdate| -1781358436914|UserlandNSTest| -1781358436928|layoutEphemeralSubviewTest| -1781358436942|loadDynamicFrameworks| -1781358436955|performKeyEquivalentTest| -1781358436969|predicateWithFormat| -1781358436983|resignFirstResponder-CPControlTextDidEndEditing| -1781358436996|sizeToFitFix| +1781382477550|ArrayController1| +1781382477564|ArrayControllerInitialSelectionTest| +1781382477577|ArrayControllerRemovingFirstTest| +1781382477591|AttachedSheet| +1781382477604|AttachedSheet2| +1781382477618|Bindings| +1781382477632|CGCanvasContext| +1781382477645|CGPath| +1781382477659|CPAlertTest| +1781382477672|CPAnimatablePropertyContainerTest| +1781382477686|CPAnimationContextTest| +1781382477700|CPAnimationTest| +1781382477713|CPBinder-echo-bug| +1781382477727|CPBoxCibTest| +1781382477741|CPBoxTest| +1781382477754|CPBrowserTest| +1781382477768|CPButtonBarTest| +1781382477782|CPButtonKeyEquivalentDefaultTest| +1781382477795|CPButtonTest| +1781382477809|CPByteCountFormatter| +1781382477822|CPCollectionViewNibTest| +1781382477836|CPColor-CPImage-description| +1781382477850|CPColorWellBindings| +1781382477863|CPComboBoxTest| +1781382477877|CPControlPerformClickExceptionTest| +1781382477891|CPControlSize| +1781382477904|CPCursor| +1781382477918|CPDateFormatterTest| +1781382477931|CPDatePickerTest| +1781382477945|CPDictionaryControllerTest| +1781382477959|CPDocumentControllerTest| +1781382477972|CPFormatterTest| +1781382477986|CPGraphicsTest| +1781382478000|CPImageAndTextViewImageScaling| +1781382478013|CPImageViewAlignmentScaling| +1781382478027|CPImageViewTest| +1781382478040|CPImageViewbindingsTest| +1781382478054|CPLevelIndicator| +1781382478068|CPLocalizationTest| +1781382478081|CPLogTest| +1781382478095|CPMenuCALayerTest| +1781382478109|CPMenuEnabledBindingsTest| +1781382478122|CPMenuKeyEquivalents| +1781382478136|CPMenuRemoveAllTest| +1781382478150|CPMenuSubmenuPlacementConstraints| +1781382478163|CPMenuTest| +1781382478177|CPOutlineViewCibTest| +1781382478191|CPOutlineViewTest| +1781382478204|CPOutlineViewViewBasedCibTest| +1781382478218|CPPanelTest| +1781382478231|CPPlatformWindow| +1781382478245|CPPlattformWindowMinSize| +1781382478258|CPPopUpButtonBindings| +1781382478272|CPPopUpButtonTest| +1781382478286|CPPopover| +1781382478299|CPPredicateEditorCibTest| +1781382478313|CPProgressIndicator| +1781382478326|CPPropertyListSerializationTest| +1781382478340|CPRadioBindings| +1781382478354|CPRuleEditorCibTest| +1781382478367|CPRuleEditorTestI8N| +1781382478381|CPScrollView| +1781382478395|CPScrollView2| +1781382478408|CPSearchField| +1781382478422|CPSearchFieldPredicateBinding| +1781382478435|CPSegmentedControlBindings| +1781382478449|CPSegmentedControlTest| +1781382478462|CPSoundTest| +1781382478476|CPSplitViewDivider| +1781382478490|CPSplitViewTest| +1781382478503|CPStackViewTest| +1781382478517|CPStepperBindings| +1781382478531|CPStepperNibTest| +1781382478544|CPTabView2| +1781382478558|CPTabViewBindings| +1781382478572|CPTabViewNib| +1781382478585|CPTableViewGroupRows| +1781382478599|CPTextField| +1781382478613|CPTextFieldEditingStyleTest| +1781382478626|CPTextFieldHeightTest| +1781382478640|CPTextFieldMovementsTest| +1781382478654|CPTextFieldMultiline| +1781382478667|CPTextView| +1781382478681|CPTextViewCibTest| +1781382478695|CPTextViewDelegateAndNotifications| +1781382478708|CPTimeZone| +1781382478722|CPTokenFieldTest| +1781382478736|CPToolTip| +1781382478749|CPToolbarTest| +1781382478763|CPTreeControllerTest| +1781382478777|CPURLConnectionAsyncTest| +1781382478790|CPURLConnectionSynchronousTest| +1781382478804|CPUserDefaults| +1781382478818|CPUserDefaultsControllerTest| +1781382478831|CPUserNotificationTest| +1781382478845|CPViewController| +1781382478859|CPVisualEffectViewTest| +1781382478872|CPWebViewTest| +1781382478886|CPWebViewTest2| +1781382478899|CPWindowLiveResizeTest| +1781382478913|CPWindowMovableTest| +1781382478927|CPWindowResizeStyle| +1781382478940|ChildWindows| +1781382478954|CompilationTests| +1781382478967|ContinuouslyUpdatesValueBinding| +1781382478981|CopyAndPaste| +1781382478995|CrossOriginTest| +1781382479008|FF4096Test| +1781382479022|FontEnhancementTest| +1781382479035|FontMetricsExplorer| +1781382479049|KeyEquivalents| +1781382479063|KeyViewLoopTest| +1781382479076|KeyWindowInTheBackgroundActivation| +1781382479090|LayoutTest| +1781382479103|LoadTimeTest| +1781382479117|LongBindings| +1781382479130|MobileTest| +1781382479144|MultipleValueBindings| +1781382479158|NSBoxTest| +1781382479171|NSBrowserTest| +1781382479185|NewTextFieldBezel| +1781382479198|Nib2CibAlignment| +1781382479212|Nib2CibBaselineAlignementTest| +1781382479226|Nib2CibSubviewsOrderTest| +1781382479239|NibAppRemixed| +1781382479253|PatternFillTest| +1781382479266|PlatformWindows| +1781382479280|PopUpButtonEscTest| +1781382479294|ScalingTest| +1781382479307|ScalingTest2| +1781382479321|ScrollviewTheming| +1781382479334|SheetWindowOrderFrontIssue| +1781382479348|SimpleBindings2| +1781382479362|SmartFoldersDemo| +1781382479375|TableTest| +1781382479389|ThemeBrowser| +1781382479403|ThemeKitchenSink| +1781382479416|TrackingArea| +1781382479430|UndoRedoWithMenuUpdate| +1781382479443|UserlandNSTest| +1781382479457|layoutEphemeralSubviewTest| +1781382479470|loadDynamicFrameworks| +1781382479484|performKeyEquivalentTest| +1781382479498|predicateWithFormat| +1781382479511|resignFirstResponder-CPControlTextDidEndEditing| +1781382479525|sizeToFitFix|