Revision: 14778
http://sourceforge.net/p/skim-app/code/14778
Author: hofman
Date: 2024-12-02 16:28:57 +0000 (Mon, 02 Dec 2024)
Log Message:
-----------
Allow informative text in password sheet to wrap. Remove it when setting string
value to nil.
Modified Paths:
--------------
trunk/Base.lproj/PasswordSheet.xib
trunk/SKTextFieldSheetController.h
trunk/SKTextFieldSheetController.m
Modified: trunk/Base.lproj/PasswordSheet.xib
===================================================================
--- trunk/Base.lproj/PasswordSheet.xib 2024-12-02 15:29:21 UTC (rev 14777)
+++ trunk/Base.lproj/PasswordSheet.xib 2024-12-02 16:28:57 UTC (rev 14778)
@@ -78,7 +78,7 @@
</textField>
<textField horizontalHuggingPriority="251"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="jj1-bT-Cz1">
<rect key="frame" x="18" y="89" width="284"
height="14"/>
- <textFieldCell key="cell" controlSize="small"
lineBreakMode="clipping" id="hnr-Wn-L7M">
+ <textFieldCell key="cell" controlSize="small"
id="hnr-Wn-L7M">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="labelColor"
catalog="System" colorSpace="catalog"/>
<color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -95,7 +95,7 @@
<constraint firstItem="10" firstAttribute="leading"
secondItem="jj1-bT-Cz1" secondAttribute="leading" id="BWf-zd-qAV"/>
<constraint firstItem="11" firstAttribute="top"
secondItem="12" secondAttribute="bottom" constant="20" id="Ddc-LY-NcF"/>
<constraint firstItem="11" firstAttribute="width"
secondItem="9" secondAttribute="width" id="Dvb-rd-8Eq"/>
- <constraint firstItem="12" firstAttribute="top"
secondItem="8" secondAttribute="top" priority="501" constant="50"
id="EgD-Lm-GJ0"/>
+ <constraint firstItem="12" firstAttribute="top"
secondItem="8" secondAttribute="top" priority="749" constant="20"
symbolic="YES" id="EgD-Lm-GJ0"/>
<constraint firstItem="jj1-bT-Cz1" firstAttribute="top"
secondItem="8" secondAttribute="top" constant="20" symbolic="YES"
id="ME9-lP-AvO"/>
<constraint firstItem="12" firstAttribute="top"
secondItem="jj1-bT-Cz1" secondAttribute="bottom" constant="8" symbolic="YES"
id="O0D-89-WBh"/>
<constraint firstItem="10" firstAttribute="leading"
secondItem="8" secondAttribute="leading" constant="20" symbolic="YES"
id="Tot-mF-i3n"/>
Modified: trunk/SKTextFieldSheetController.h
===================================================================
--- trunk/SKTextFieldSheetController.h 2024-12-02 15:29:21 UTC (rev 14777)
+++ trunk/SKTextFieldSheetController.h 2024-12-02 16:28:57 UTC (rev 14778)
@@ -50,7 +50,7 @@
@property (nonatomic, nullable, strong) IBOutlet NSTextField *textField,
*informativeTextField;
@property (nonatomic, nullable, strong) IBOutlet NSButton *okButton,
*cancelButton;
@property (nonatomic, strong) NSString *stringValue;
-@property (nonatomic, strong) NSString *informativeText;
+@property (nonatomic, nullable, strong) NSString *informativeText;
@end
Modified: trunk/SKTextFieldSheetController.m
===================================================================
--- trunk/SKTextFieldSheetController.m 2024-12-02 15:29:21 UTC (rev 14777)
+++ trunk/SKTextFieldSheetController.m 2024-12-02 16:28:57 UTC (rev 14778)
@@ -64,8 +64,14 @@
}
- (void)setInformativeText:(NSString *)string {
- [self window];
- [[self informativeTextField] setStringValue:string];
+ if (string) {
+ [[self window] layoutIfNeeded];
+ [[self informativeTextField] setPreferredMaxLayoutWidth:NSWidth([[self
informativeTextField] frame]) - 4.0];
+ [[self informativeTextField] setStringValue:string];
+ } else {
+ [self window];
+ [[self informativeTextField] removeFromSuperview];
+ }
}
- (NSTouchBar *)makeTouchBar {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
