diff --git a/Frameworks/AppKit/Browser.environment/AppKit.sj b/Frameworks/AppKit/Browser.environment/AppKit.sj index 3fd488c2c..c0dc1bc41 100644 --- a/Frameworks/AppKit/Browser.environment/AppKit.sj +++ b/Frameworks/AppKit/Browser.environment/AppKit.sj @@ -75241,7 +75241,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_ ,["void"])]); } -p;12;CPTextView.jt;332544;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPLayoutManager.ji;18;CPParagraphStyle.ji;12;CPTextList.ji;17;CPTextContainer.ji;13;CPRulerView.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;332291;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("CPTextList.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPRulerView.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);; +p;12;CPTextView.jt;332582;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPLayoutManager.ji;18;CPParagraphStyle.ji;12;CPTextList.ji;17;CPTextContainer.ji;13;CPRulerView.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;332329;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("CPTextList.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPRulerView.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);; ; ; ; @@ -77045,9 +77045,9 @@ class_addMethods(the_class, [new objj_method(sel_getUid("allowsUndo"), function } else { - attributes = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["attributesAtIndex:longestEffectiveRange:inRange:"] || _objj_forward)(___r1, "attributesAtIndex:longestEffectiveRange:inRange:", self._selectionRange.location, self._selectionRange, self._selectionRange)); - oldFont = (attributes == null ? attributes : (attributes.isa.method_msgSend["objectForKey:"] || _objj_forward)(attributes, "objectForKey:", CPFontAttributeName)) || (self.isa.method_msgSend["font"] || _objj_forward)(self, "font"); + oldFont = ((___r1 = self._typingAttributes), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["objectForKey:"] || _objj_forward)(___r1, "objectForKey:", CPFontAttributeName)) || (self.isa.method_msgSend["font"] || _objj_forward)(self, "font"); ((___r1 = self._typingAttributes), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setObject:forKey:"] || _objj_forward)(___r1, "setObject:forKey:", (sender == null ? sender : (sender.isa.method_msgSend["convertFont:"] || _objj_forward)(sender, "convertFont:", oldFont)), CPFontAttributeName)); + ((___r1 = (CPNotificationCenter.isa.method_msgSend["defaultCenter"] || _objj_forward)(CPNotificationCenter, "defaultCenter")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["postNotificationName:object:"] || _objj_forward)(___r1, "postNotificationName:object:", CPTextViewDidChangeTypingAttributesNotification, self)); } } else diff --git a/Frameworks/AppKit/CommonJS.environment/AppKit.sj b/Frameworks/AppKit/CommonJS.environment/AppKit.sj index 3fd488c2c..c0dc1bc41 100644 --- a/Frameworks/AppKit/CommonJS.environment/AppKit.sj +++ b/Frameworks/AppKit/CommonJS.environment/AppKit.sj @@ -75241,7 +75241,7 @@ var meta_class = the_class.isa;class_addMethods(the_class, [new objj_method(sel_ ,["void"])]); } -p;12;CPTextView.jt;332544;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPLayoutManager.ji;18;CPParagraphStyle.ji;12;CPTextList.ji;17;CPTextContainer.ji;13;CPRulerView.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;332291;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("CPTextList.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPRulerView.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);; +p;12;CPTextView.jt;332582;@STATIC;1.0;i;8;CPText.ji;14;CPPasteboard.ji;14;CPColorPanel.ji;15;CPFontManager.ji;15;CPTextStorage.ji;17;CPLayoutManager.ji;18;CPParagraphStyle.ji;12;CPTextList.ji;17;CPTextContainer.ji;13;CPRulerView.ji;14;_CPRTFParser.ji;16;_CPRTFProducer.jt;332329;objj_executeFile("CPText.j", YES);objj_executeFile("CPPasteboard.j", YES);objj_executeFile("CPColorPanel.j", YES);objj_executeFile("CPFontManager.j", YES);objj_executeFile("CPTextStorage.j", YES);objj_executeFile("CPLayoutManager.j", YES);objj_executeFile("CPParagraphStyle.j", YES);objj_executeFile("CPTextList.j", YES);objj_executeFile("CPTextContainer.j", YES);objj_executeFile("CPRulerView.j", YES);objj_executeFile("_CPRTFParser.j", YES);objj_executeFile("_CPRTFProducer.j", YES);; ; ; ; @@ -77045,9 +77045,9 @@ class_addMethods(the_class, [new objj_method(sel_getUid("allowsUndo"), function } else { - attributes = ((___r1 = self._textStorage), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["attributesAtIndex:longestEffectiveRange:inRange:"] || _objj_forward)(___r1, "attributesAtIndex:longestEffectiveRange:inRange:", self._selectionRange.location, self._selectionRange, self._selectionRange)); - oldFont = (attributes == null ? attributes : (attributes.isa.method_msgSend["objectForKey:"] || _objj_forward)(attributes, "objectForKey:", CPFontAttributeName)) || (self.isa.method_msgSend["font"] || _objj_forward)(self, "font"); + oldFont = ((___r1 = self._typingAttributes), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["objectForKey:"] || _objj_forward)(___r1, "objectForKey:", CPFontAttributeName)) || (self.isa.method_msgSend["font"] || _objj_forward)(self, "font"); ((___r1 = self._typingAttributes), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["setObject:forKey:"] || _objj_forward)(___r1, "setObject:forKey:", (sender == null ? sender : (sender.isa.method_msgSend["convertFont:"] || _objj_forward)(sender, "convertFont:", oldFont)), CPFontAttributeName)); + ((___r1 = (CPNotificationCenter.isa.method_msgSend["defaultCenter"] || _objj_forward)(CPNotificationCenter, "defaultCenter")), ___r1 == null ? ___r1 : (___r1.isa.method_msgSend["postNotificationName:object:"] || _objj_forward)(___r1, "postNotificationName:object:", CPTextViewDidChangeTypingAttributesNotification, self)); } } else diff --git a/Resources/TextEditor/WORKLIST.md b/Resources/TextEditor/WORKLIST.md index 651d380ac..b618c20ac 100644 --- a/Resources/TextEditor/WORKLIST.md +++ b/Resources/TextEditor/WORKLIST.md @@ -85,4 +85,5 @@ How the text system works, for the entries below: `CPTextView` does not use CSS - Edit > Copy, Cut and Paste from the menu: plain text moves to and from other applications through the system clipboard; text copied and pasted within the application keeps its style. Command-V pastes text copied in another application, not an earlier copy within the application. - Edit > Insert Image…: a JPEG or PNG image is inserted inside the text and at the end of the text. - A wide image fits the text width, and scales with the window without growing beyond its natural size. At the end of the text it is not clipped, and the scroll bars follow it. +- Format > Font > Bigger and Smaller (Command-+ and Command--) without a selection change the size of the text typed next, step by step, also in a blank document. - Builds with both the legacy toolchain and capp-build. diff --git a/Resources/recipes.txt b/Resources/recipes.txt index ade0ac98c..218db4957 100644 --- a/Resources/recipes.txt +++ b/Resources/recipes.txt @@ -1,150 +1,150 @@ -1792868022601|ArrayControllerInitialSelectionTest| -1792868022621|ArrayControllerRemovingFirstTest| -1792868022639|ArrayControllerTest| -1792868022658|AttachedSheet2Test| -1792868022677|AttachedSheetTest| -1792868022696|BindingContentArrayTest| -1792868022716|CGCanvasContextTest| -1792868022735|CGPathTest| -1792868022753|CPAlertTest| -1792868022772|CPAnimatablePropertyContainerTest| -1792868022791|CPAnimationContextTest| -1792868022810|CPAnimationTest| -1792868022829|CPBinderEchoBug| -1792868022848|CPBoxCibTest| -1792868022867|CPBoxTest| -1792868022885|CPBrowserTest| -1792868022905|CPButtonBarTest| -1792868022924|CPButtonKeyEquivalentDefaultTest| -1792868022943|CPButtonTest| -1792868022962|CPByteCountFormatterTest| -1792868022980|CPCollectionViewNibTest| -1792868022999|CPColorCPImageDescriptionTest| -1792868023173|CPColorWellBindingsTest| -1792868023356|CPComboBoxTest| -1792868023539|CPControlPerformClickExceptionTest| -1792868023723|CPControlSizeTest| -1792868023907|CPCursorTest| -1792868023109|CPDateFormatterTest| -1792868023127|CPDatePickerTest| -1792868023146|CPDictionaryControllerTest| -1792868023164|CPDocumentControllerTest| -1792868023182|CPFormatterTest| -1792868023200|CPGraphicsTest| -1792868023219|CPImageAndTextViewImageScalingTest| -1792868023238|CPImageViewAlignmentScaling| -1792868023257|CPImageViewTest| -1792868023275|CPImageViewbindingsTest| -1792868023294|CPLanguageModelChatbotTest| -1792868023312|CPLevelIndicator| -1792868023331|CPLevelIndicatorTest| -1792868023349|CPLocalizationTest| -1792868023368|CPLogTest| -1792868023386|CPMarkdownParserTest| -1792868023405|CPMenuCALayerTest| -1792868023423|CPMenuEnabledBindingsTest| -1792868023442|CPMenuKeyEquivalentsTest| -1792868023460|CPMenuRemoveAllTest| -1792868023479|CPMenuSubmenuPlacementConstraints| -1792868023498|CPMenuTest| -1792868023516|CPOutlineViewCibTest| -1792868023535|CPOutlineViewTest| -1792868023554|CPOutlineViewViewBasedCibTest| -1792868023573|CPPanelTest| -1792868023592|CPPlatformWindow| -1792868023610|CPPlattformWindowMinSize| -1792868023629|CPPopUpButtonBindingsTest| -1792868023647|CPPopUpButtonTest| -1792868023666|CPPopoverTest| -1792868023684|CPPredicateEditorCibTest| -1792868023703|CPProgressIndicatorTest| -1792868023721|CPPropertyListSerializationTest| -1792868023740|CPRadioBindingsTest| -1792868023758|CPRuleEditorCibTest| -1792868023777|CPRuleEditorTest| -1792868023795|CPScrollView2Test| -1792868023814|CPScrollViewTest| -1792868023833|CPSearchFieldPredicateBinding| -1792868023851|CPSearchFieldTest| -1792868023870|CPSegmentedControlBindingsTest| -1792868023888|CPSegmentedControlTest| -1792868023906|CPSoundTest| -1792868023925|CPSplitViewDividerTest| -1792868023943|CPSplitViewTest| -1792868023962|CPStackViewTest| -1792868023980|CPStepperBindingsTest| -1792868023998|CPStepperNibTest| -1792868024173|CPTabView2Test| -1792868024358|CPTabViewBindingsTest| -1792868024542|CPTabViewNibTest| -1792868024730|CPTableViewGroupRowsTest| -1792868024914|CPTextFieldEditingStyleTest| -1792868024109|CPTextFieldHeightTest| -1792868024128|CPTextFieldMovementsTest| -1792868024146|CPTextFieldMultiLineTest| -1792868024164|CPTextFieldTest| -1792868024183|CPTextViewCibTest| -1792868024201|CPTextViewDelegateAndNotificationsTest| -1792868024220|CPTimeZoneTest| -1792868024238|CPTokenFieldTest| -1792868024257|CPToolTipTest| -1792868024275|CPToolbarTest| -1792868024294|CPTreeControllerTest| -1792868024313|CPURLConnectionAsyncTest| -1792868024331|CPURLConnectionSynchronousTest| -1792868024349|CPUserDefaultsControllerTest| -1792868024368|CPUserDefaultsTest| -1792868024386|CPUserNotificationTest| -1792868024405|CPViewControllerTest| -1792868024423|CPVisualEffectViewTest| -1792868024442|CPWebViewTest| -1792868024460|CPWebViewTest2| -1792868024479|CPWindowLiveResizeTest| -1792868024497|CPWindowMovableTest| -1792868024516|CPWindowResizeStyleTest| -1792868024534|ChildWindowsTest| -1792868024553|CompilationTests| -1792868024573|ContinuouslyUpdatesValueBinding| -1792868024592|CopyAndPasteTest| -1792868024610|CrossOriginTest| -1792868024629|FF4096Test| -1792868024647|FontEnhancementTest| -1792868024665|FontMetricsExplorerTest| -1792868024684|KeyEquivalentsTest| -1792868024702|KeyViewLoopTest| -1792868024721|KeyWindowInTheBackgroundActivation| -1792868024739|LayoutTest| -1792868024758|LoadDynamicFrameworksTest| -1792868024777|LoadTimeTest| -1792868024795|LongBindingsTest| -1792868024814|MobileTest| -1792868024832|MultipleValueBindingsTest| -1792868024851|NSBoxTest| -1792868024870|NSBrowserTest| -1792868024888|NewTextFieldBezelTest| -1792868024906|Nib2CibAlignmentTest| -1792868024925|Nib2CibBaselineAlignementTest| -1792868024943|Nib2CibSubviewsOrderTest| -1792868024962|NibAppRemixedTest| -1792868024980|PatternFillTest| -1792868024999|PlatformWindowsTest| -1792868025187|PopUpButtonEscTest| -1792868025375|PredicateWithFormatTest| -1792868025560|ResignFirstResponderWithCPControlTextDidEndEditingTest| -1792868025755|Scaling2Test| -1792868025951|ScalingTest| -1792868025113|ScrollviewThemingTest| -1792868025132|SimpleBindings2Test| -1792868025150|SizeToFitTest| -1792868025169|SmartFoldersDemo| -1792868025187|SmartFoldersTest| -1792868025205|TableTest| -1792868025224|TextEditor| -1792868025242|ThemeBrowserTest| -1792868025261|ThemeKitchenSinkTest| -1792868025279|TrackingAreaTest| -1792868025298|UndoRedoWithMenuUpdateTest| -1792868025316|UserlandNSTest| -1792868025335|WindowSheetOrderTest| -1792868025354|layoutEphemeralSubviewTest| -1792868025372|performKeyEquivalentTest| +1792868505411|ArrayControllerInitialSelectionTest| +1792868505430|ArrayControllerRemovingFirstTest| +1792868505449|ArrayControllerTest| +1792868505468|AttachedSheet2Test| +1792868505487|AttachedSheetTest| +1792868505506|BindingContentArrayTest| +1792868505524|CGCanvasContextTest| +1792868505543|CGPathTest| +1792868505561|CPAlertTest| +1792868505579|CPAnimatablePropertyContainerTest| +1792868505598|CPAnimationContextTest| +1792868505618|CPAnimationTest| +1792868505637|CPBinderEchoBug| +1792868505655|CPBoxCibTest| +1792868505673|CPBoxTest| +1792868505692|CPBrowserTest| +1792868505710|CPButtonBarTest| +1792868505728|CPButtonKeyEquivalentDefaultTest| +1792868505747|CPButtonTest| +1792868505765|CPByteCountFormatterTest| +1792868505783|CPCollectionViewNibTest| +1792868505802|CPColorCPImageDescriptionTest| +1792868505820|CPColorWellBindingsTest| +1792868505838|CPComboBoxTest| +1792868505857|CPControlPerformClickExceptionTest| +1792868505875|CPControlSizeTest| +1792868505894|CPCursorTest| +1792868505912|CPDateFormatterTest| +1792868505930|CPDatePickerTest| +1792868505948|CPDictionaryControllerTest| +1792868505967|CPDocumentControllerTest| +1792868505985|CPFormatterTest| +1792868506411|CPGraphicsTest| +1792868506221|CPImageAndTextViewImageScalingTest| +1792868506403|CPImageViewAlignmentScaling| +1792868506587|CPImageViewTest| +1792868506771|CPImageViewbindingsTest| +1792868506954|CPLanguageModelChatbotTest| +1792868506113|CPLevelIndicator| +1792868506132|CPLevelIndicatorTest| +1792868506150|CPLocalizationTest| +1792868506168|CPLogTest| +1792868506187|CPMarkdownParserTest| +1792868506205|CPMenuCALayerTest| +1792868506224|CPMenuEnabledBindingsTest| +1792868506243|CPMenuKeyEquivalentsTest| +1792868506262|CPMenuRemoveAllTest| +1792868506280|CPMenuSubmenuPlacementConstraints| +1792868506299|CPMenuTest| +1792868506318|CPOutlineViewCibTest| +1792868506337|CPOutlineViewTest| +1792868506355|CPOutlineViewViewBasedCibTest| +1792868506374|CPPanelTest| +1792868506392|CPPlatformWindow| +1792868506411|CPPlattformWindowMinSize| +1792868506430|CPPopUpButtonBindingsTest| +1792868506449|CPPopUpButtonTest| +1792868506468|CPPopoverTest| +1792868506488|CPPredicateEditorCibTest| +1792868506506|CPProgressIndicatorTest| +1792868506525|CPPropertyListSerializationTest| +1792868506544|CPRadioBindingsTest| +1792868506563|CPRuleEditorCibTest| +1792868506581|CPRuleEditorTest| +1792868506600|CPScrollView2Test| +1792868506619|CPScrollViewTest| +1792868506638|CPSearchFieldPredicateBinding| +1792868506657|CPSearchFieldTest| +1792868506675|CPSegmentedControlBindingsTest| +1792868506694|CPSegmentedControlTest| +1792868506713|CPSoundTest| +1792868506731|CPSplitViewDividerTest| +1792868506750|CPSplitViewTest| +1792868506769|CPStackViewTest| +1792868506787|CPStepperBindingsTest| +1792868506806|CPStepperNibTest| +1792868506824|CPTabView2Test| +1792868506843|CPTabViewBindingsTest| +1792868506861|CPTabViewNibTest| +1792868506880|CPTableViewGroupRowsTest| +1792868506899|CPTextFieldEditingStyleTest| +1792868506917|CPTextFieldHeightTest| +1792868506936|CPTextFieldMovementsTest| +1792868506976|CPTextFieldMultiLineTest| +1792868506995|CPTextFieldTest| +1792868507136|CPTextViewCibTest| +1792868507323|CPTextViewDelegateAndNotificationsTest| +1792868507508|CPTimeZoneTest| +1792868507693|CPTokenFieldTest| +1792868507878|CPToolTipTest| +1792868507106|CPToolbarTest| +1792868507124|CPTreeControllerTest| +1792868507143|CPURLConnectionAsyncTest| +1792868507161|CPURLConnectionSynchronousTest| +1792868507180|CPUserDefaultsControllerTest| +1792868507198|CPUserDefaultsTest| +1792868507216|CPUserNotificationTest| +1792868507235|CPViewControllerTest| +1792868507253|CPVisualEffectViewTest| +1792868507271|CPWebViewTest| +1792868507290|CPWebViewTest2| +1792868507308|CPWindowLiveResizeTest| +1792868507326|CPWindowMovableTest| +1792868507345|CPWindowResizeStyleTest| +1792868507364|ChildWindowsTest| +1792868507383|CompilationTests| +1792868507402|ContinuouslyUpdatesValueBinding| +1792868507421|CopyAndPasteTest| +1792868507440|CrossOriginTest| +1792868507459|FF4096Test| +1792868507478|FontEnhancementTest| +1792868507497|FontMetricsExplorerTest| +1792868507515|KeyEquivalentsTest| +1792868507534|KeyViewLoopTest| +1792868507552|KeyWindowInTheBackgroundActivation| +1792868507571|LayoutTest| +1792868507590|LoadDynamicFrameworksTest| +1792868507609|LoadTimeTest| +1792868507627|LongBindingsTest| +1792868507646|MobileTest| +1792868507664|MultipleValueBindingsTest| +1792868507683|NSBoxTest| +1792868507702|NSBrowserTest| +1792868507720|NewTextFieldBezelTest| +1792868507739|Nib2CibAlignmentTest| +1792868507757|Nib2CibBaselineAlignementTest| +1792868507776|Nib2CibSubviewsOrderTest| +1792868507794|NibAppRemixedTest| +1792868507812|PatternFillTest| +1792868507831|PlatformWindowsTest| +1792868507849|PopUpButtonEscTest| +1792868507867|PredicateWithFormatTest| +1792868507886|ResignFirstResponderWithCPControlTextDidEndEditingTest| +1792868507904|Scaling2Test| +1792868507922|ScalingTest| +1792868507941|ScrollviewThemingTest| +1792868507959|SimpleBindings2Test| +1792868507978|SizeToFitTest| +1792868507996|SmartFoldersDemo| +1792868508157|SmartFoldersTest| +1792868508343|TableTest| +1792868508528|TextEditor| +1792868508716|ThemeBrowserTest| +1792868508904|ThemeKitchenSinkTest| +1792868508108|TrackingAreaTest| +1792868508127|UndoRedoWithMenuUpdateTest| +1792868508146|UserlandNSTest| +1792868508165|WindowSheetOrderTest| +1792868508184|layoutEphemeralSubviewTest| +1792868508203|performKeyEquivalentTest|