Revision: 14127
http://sourceforge.net/p/skim-app/code/14127
Author: hofman
Date: 2024-03-22 22:51:06 +0000 (Fri, 22 Mar 2024)
Log Message:
-----------
Use ell subclass to fix baseline of text field in toolbar
Modified Paths:
--------------
trunk/MainToolbar.xib
trunk/SKMainToolbarController.h
trunk/SKMainToolbarController.m
Modified: trunk/MainToolbar.xib
===================================================================
--- trunk/MainToolbar.xib 2024-03-22 18:11:53 UTC (rev 14126)
+++ trunk/MainToolbar.xib 2024-03-22 22:51:06 UTC (rev 14127)
@@ -547,7 +547,7 @@
<constraints>
<constraint firstAttribute="width" constant="60"
id="4RV-ZC-n5Z"/>
</constraints>
- <textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="43">
+ <textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="43" customClass="SKToolbarTextFieldCell">
<numberFormatter key="formatter"
formatterBehavior="default10_4" numberStyle="percent"
usesGroupingSeparator="NO" lenient="YES" formatWidth="-1"
minimumIntegerDigits="1" maximumIntegerDigits="2000000000" decimalSeparator="."
groupingSeparator="," id="44">
<integer key="multiplier" value="100"/>
<real key="minimum" value="0.10000000000000001"/>
@@ -583,7 +583,7 @@
<constraints>
<constraint firstAttribute="width" constant="50"
id="dgE-6k-Kfl"/>
</constraints>
- <textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="41">
+ <textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="41" customClass="SKToolbarTextFieldCell">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
<color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -674,7 +674,7 @@
<constraints>
<constraint firstAttribute="width" constant="30"
id="vHA-D8-mGk"/>
</constraints>
- <textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="9cD-jS-bcm">
+ <textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="9cD-jS-bcm" customClass="SKToolbarTextFieldCell">
<numberFormatter key="formatter"
formatterBehavior="default10_4" numberStyle="decimal" formatWidth="-1"
minimumIntegerDigits="1" maximumIntegerDigits="2000000000"
maximumFractionDigits="3" id="cUi-co-kf3">
<real key="minimum" value="1"/>
</numberFormatter>
Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h 2024-03-22 18:11:53 UTC (rev 14126)
+++ trunk/SKMainToolbarController.h 2024-03-22 22:51:06 UTC (rev 14127)
@@ -145,4 +145,8 @@
@end
+
+@interface SKToolbarTextFieldCell : NSTextFieldCell
+@end
+
NS_ASSUME_NONNULL_END
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2024-03-22 18:11:53 UTC (rev 14126)
+++ trunk/SKMainToolbarController.m 2024-03-22 22:51:06 UTC (rev 14127)
@@ -61,6 +61,7 @@
#import "PDFAnnotation_SKExtensions.h"
#import "PDFDocument_SKExtensions.h"
#import "SKShareMenuController.h"
+#import "NSFont_SKExtensions.h"
#define SKDocumentToolbarIdentifier @"SKDocumentToolbar"
@@ -1374,3 +1375,15 @@
}
@end
+
+
+@implementation SKToolbarTextFieldCell
+
+- (NSRect)drawingRectForBounds:(NSRect)rect {
+ NSRect r = [super drawingRectForBounds:rect];
+ r.size.height = [[self font] defaultViewLineHeight];
+ r.origin.y = floor(0.5 * (NSHeight(rect) - NSHeight(r)));
+ return r;
+}
+
+@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
