【fix】【测量】属性栏按钮显示不全等UI细节问题

PDF Office/PDF Master/Class/PDFTools/Measure/Side/KMMeasureSideVC.swift

@@ -21,6 +21,7 @@ class KMMeasureSideVC: NSViewController {
     @IBOutlet private weak var previewImageView: NSImageView!
     // Type
     @IBOutlet private weak var typeView: NSView!
+    @IBOutlet weak var typeBoxView: NSView!
     @IBOutlet private weak var typeSubView1: NSView!
     @IBOutlet private weak var typeButton1: NSButton!
     @IBOutlet private weak var typeSubView2: NSView!
@@ -191,10 +192,11 @@ class KMMeasureSideVC: NSViewController {
         font_PopUpButton.type = .arrowDown
         font_PopUpButton.removeAllItems()
         
-        font_PopUpButton.type = .arrowDown
-        font_PopUpButton.removeAllItems()
+        font_StylePopUpButton.type = .arrowDown
+        font_StylePopUpButton.removeAllItems()
         
         font_SizeComboBox.type = .none
+        font_SizeComboBox.comboxRect = font_SizeComboBox.bounds
         
         lineStyle_SolidImageView.image = NSImage(named: "KMImageNameLifeStyle")
         lineStyle_DottedImageView.image = NSImage(named: "KMImageNameLifeStyle2")
@@ -447,6 +449,9 @@ class KMMeasureSideVC: NSViewController {
     }
     
     func updateViewColor() {
+        self.typeBoxView.wantsLayer = true
+        self.typeBoxView.layer?.borderWidth = 1
+        
         if KMAppearance.isDarkMode() {
             let darkColor = NSColor(red: 57/255.0, green: 60/255.0, blue: 62/255.0, alpha: 1.0).cgColor
             let borderColor = NSColor(red: 86/255.0, green: 88/255.0, blue: 90/255.0, alpha: 1.0).cgColor
@@ -457,7 +462,7 @@ class KMMeasureSideVC: NSViewController {
             setViewColor(lineWidthComboBox, darkColor, borderColor)
             setViewColor(opacityComboBox, darkColor, borderColor)
             setViewColor(opacityComboBox, darkColor, borderColor)
-
+            self.typeBoxView.layer?.borderColor = NSColor(hex: "#424345").cgColor
         } else {
             let lightColor = NSColor.white.cgColor
             let borderColor = NSColor(red: 218/255.0, green: 219/255.0, blue: 222/255.0, alpha: 1.0).cgColor
@@ -468,7 +473,8 @@ class KMMeasureSideVC: NSViewController {
             setViewColor(lineWidthComboBox, lightColor, borderColor)
             setViewColor(opacityComboBox, lightColor, borderColor)
             setViewColor(opacityComboBox, lightColor, borderColor)
-
+            
+            self.typeBoxView.layer?.borderColor = NSColor(hex: "#E2E3E6").cgColor
         }
     }
     

PDF Office/PDF Master/Class/PDFTools/Measure/Side/KMMeasureSideVC.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -47,6 +47,7 @@
                 <outlet property="startEnd_StartPopUpButton" destination="Wib-02-9dq" id="Tal-UT-zF3"/>
                 <outlet property="startEnd_TopConstant" destination="mr9-AV-xog" id="fyE-j4-VB9"/>
                 <outlet property="startEnd_View" destination="WCX-mL-xfX" id="Uy8-0g-bNz"/>
+                <outlet property="typeBoxView" destination="KJb-7Z-NB6" id="ymN-dF-DqJ"/>
                 <outlet property="typeButton1" destination="Iuj-Kt-FGN" id="fgS-ve-Gmt"/>
                 <outlet property="typeButton2" destination="jif-w7-Q5T" id="1hU-a6-Zbs"/>
                 <outlet property="typeButton3" destination="MVN-xC-n7j" id="8jc-n7-n63"/>
@@ -73,10 +74,10 @@
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <view translatesAutoresizingMaskIntoConstraints="NO" id="hrB-1R-XwJ">
-                        <rect key="frame" x="0.0" y="-124" width="481" height="785"/>
+                        <rect key="frame" x="0.0" y="-119" width="481" height="780"/>
                         <subviews>
                             <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="dV9-GQ-3pk">
-                                <rect key="frame" x="16" y="705" width="449" height="80"/>
+                                <rect key="frame" x="16" y="700" width="449" height="80"/>
                                 <view key="contentView" id="KK3-7C-TZH">
                                     <rect key="frame" x="0.0" y="0.0" width="449" height="80"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -101,7 +102,7 @@
                                 <color key="fillColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </box>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="db4-tx-GKU">
-                                <rect key="frame" x="16" y="661" width="449" height="32"/>
+                                <rect key="frame" x="16" y="656" width="449" height="32"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="KJb-7Z-NB6">
                                         <rect key="frame" x="145" y="0.0" width="160" height="32"/>
@@ -244,9 +245,9 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="stF-lk-Px9">
-                                <rect key="frame" x="16" y="329" width="449" height="64"/>
+                                <rect key="frame" x="16" y="327" width="449" height="64"/>
                                 <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZP8-hL-mPu">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZP8-hL-mPu">
                                         <rect key="frame" x="-2" y="34" width="52" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="o0c-hd-VGs"/>
@@ -257,8 +258,8 @@
                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="g8X-5L-1kw" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="379" y="1" width="73" height="23"/>
+                                    <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="g8X-5L-1kw" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                                        <rect key="frame" x="377" y="0.0" width="72" height="23"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="69" id="Vr5-nw-ODj"/>
                                         </constraints>
@@ -281,7 +282,7 @@
                                         </connections>
                                     </comboBox>
                                     <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JhQ-39-0CI">
-                                        <rect key="frame" x="-2" y="-1" width="376" height="23"/>
+                                        <rect key="frame" x="-2" y="-1" width="373" height="23"/>
                                         <sliderCell key="cell" state="on" alignment="left" minValue="0.5" maxValue="18" doubleValue="0.5" tickMarkPosition="above" sliderType="linear" id="hVk-ke-xNd"/>
                                         <connections>
                                             <action selector="thicknessSliderAction:" target="-2" id="ZWF-tz-w9A"/>
@@ -292,7 +293,7 @@
                                     <constraint firstItem="ZP8-hL-mPu" firstAttribute="top" secondItem="stF-lk-Px9" secondAttribute="top" constant="10" id="3K9-vt-lBK"/>
                                     <constraint firstItem="g8X-5L-1kw" firstAttribute="leading" secondItem="JhQ-39-0CI" secondAttribute="trailing" constant="8" id="Hed-K1-3tP"/>
                                     <constraint firstAttribute="height" constant="64" id="PnI-N4-YbJ"/>
-                                    <constraint firstAttribute="trailing" secondItem="g8X-5L-1kw" secondAttribute="trailing" id="WKb-Ac-sEd"/>
+                                    <constraint firstAttribute="trailing" secondItem="g8X-5L-1kw" secondAttribute="trailing" constant="3" id="WKb-Ac-sEd"/>
                                     <constraint firstItem="ZP8-hL-mPu" firstAttribute="leading" secondItem="stF-lk-Px9" secondAttribute="leading" id="dld-GP-Fgo"/>
                                     <constraint firstItem="JhQ-39-0CI" firstAttribute="leading" secondItem="stF-lk-Px9" secondAttribute="leading" id="e4z-OO-wTM"/>
                                     <constraint firstAttribute="bottom" secondItem="JhQ-39-0CI" secondAttribute="bottom" constant="5" id="edW-LE-jle"/>
@@ -301,12 +302,12 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="sv1-ye-km4">
-                                <rect key="frame" x="16" y="225" width="449" height="104"/>
+                                <rect key="frame" x="16" y="223" width="449" height="104"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="QPc-Pt-nlu">
                                         <rect key="frame" x="0.0" y="72" width="449" height="32"/>
                                         <subviews>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YdU-MQ-e0v">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YdU-MQ-e0v">
                                                 <rect key="frame" x="-2" y="8" width="64" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Line Style" id="plB-2D-Cap">
                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -326,14 +327,14 @@
                                         <subviews>
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="P7u-1k-sU0">
                                                 <rect key="frame" x="0.0" y="6" width="20" height="20"/>
-                                                <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="AIchange" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="aPC-te-078">
-                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="system"/>
-                                                </buttonCell>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="4Pd-RI-PEi"/>
                                                     <constraint firstAttribute="width" constant="20" id="dSK-Tf-Fzw"/>
                                                 </constraints>
+                                                <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="AIchange" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="aPC-te-078">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
                                                 <connections>
                                                     <action selector="lineStyleButtonAction:" target="-2" id="Y1o-pc-GhN"/>
                                                 </connections>
@@ -360,14 +361,14 @@
                                         <subviews>
                                             <button tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="5Ap-Ht-ASC">
                                                 <rect key="frame" x="0.0" y="6" width="20" height="20"/>
-                                                <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="AIchange" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="XR9-8F-wdf">
-                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="system"/>
-                                                </buttonCell>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="20" id="rBz-4w-kCr"/>
                                                     <constraint firstAttribute="width" constant="20" id="yTb-3p-2lE"/>
                                                 </constraints>
+                                                <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="AIchange" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="XR9-8F-wdf">
+                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                    <font key="font" metaFont="system"/>
+                                                </buttonCell>
                                                 <connections>
                                                     <action selector="lineStyleButtonAction:" target="-2" id="W9a-6t-WpC"/>
                                                 </connections>
@@ -379,8 +380,8 @@
                                                 </constraints>
                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="Gc0-EO-5ne"/>
                                             </imageView>
-                                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zsv-cd-gPh" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                <rect key="frame" x="379" y="4" width="73" height="23"/>
+                                            <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zsv-cd-gPh" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                                                <rect key="frame" x="377" y="4" width="72" height="23"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="69" id="Vjg-K7-yVm"/>
                                                 </constraints>
@@ -407,7 +408,7 @@
                                             <constraint firstItem="yvy-I6-8US" firstAttribute="centerY" secondItem="Rax-Hz-iCT" secondAttribute="centerY" id="DU0-do-lj8"/>
                                             <constraint firstAttribute="height" constant="32" id="JbN-yq-WtV"/>
                                             <constraint firstItem="Zsv-cd-gPh" firstAttribute="centerY" secondItem="Rax-Hz-iCT" secondAttribute="centerY" id="czh-e9-E6F"/>
-                                            <constraint firstAttribute="trailing" secondItem="Zsv-cd-gPh" secondAttribute="trailing" id="dyu-KG-ywU"/>
+                                            <constraint firstAttribute="trailing" secondItem="Zsv-cd-gPh" secondAttribute="trailing" constant="3" id="dyu-KG-ywU"/>
                                             <constraint firstAttribute="trailing" secondItem="yvy-I6-8US" secondAttribute="trailing" constant="84" id="lQQ-Pe-p2d"/>
                                             <constraint firstItem="yvy-I6-8US" firstAttribute="leading" secondItem="5Ap-Ht-ASC" secondAttribute="trailing" constant="4" id="mRS-NK-Wys"/>
                                             <constraint firstItem="5Ap-Ht-ASC" firstAttribute="leading" secondItem="Rax-Hz-iCT" secondAttribute="leading" id="psK-wy-vgP"/>
@@ -430,12 +431,12 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="WCX-mL-xfX">
-                                <rect key="frame" x="16" y="161" width="449" height="64"/>
+                                <rect key="frame" x="16" y="159" width="449" height="64"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Q0n-es-MlW">
                                         <rect key="frame" x="0.0" y="32" width="449" height="32"/>
                                         <subviews>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N5b-9k-Q9U">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N5b-9k-Q9U">
                                                 <rect key="frame" x="-2" y="8" width="74" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Start &amp; End" id="vNb-39-gWK">
                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -454,7 +455,7 @@
                                         <rect key="frame" x="0.0" y="0.0" width="449" height="32"/>
                                         <subviews>
                                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="Wib-02-9dq" customClass="KMPopUpButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                <rect key="frame" x="-5" y="0.0" width="228" height="32"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="225" height="32"/>
                                                 <popUpButtonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="left" lineBreakMode="truncatingTail" inset="2" arrowPosition="noArrow" id="rKK-kz-Z0l" customClass="KMPopUpButtonCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
@@ -462,7 +463,7 @@
                                                 </popUpButtonCell>
                                             </popUpButton>
                                             <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="7Er-ld-5uZ" customClass="KMPopUpButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                <rect key="frame" x="222" y="0.0" width="227" height="32"/>
+                                                <rect key="frame" x="224" y="0.0" width="225" height="32"/>
                                                 <popUpButtonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="left" lineBreakMode="truncatingTail" inset="2" arrowPosition="noArrow" id="Fte-Qa-oBp" customClass="KMPopUpButtonCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="menu"/>
@@ -474,7 +475,7 @@
                                             <constraint firstItem="7Er-ld-5uZ" firstAttribute="top" secondItem="QsI-2P-QDa" secondAttribute="top" id="CdL-VI-LYo"/>
                                             <constraint firstItem="Wib-02-9dq" firstAttribute="top" secondItem="QsI-2P-QDa" secondAttribute="top" id="Mdh-y9-QgX"/>
                                             <constraint firstAttribute="height" constant="32" id="O3M-MR-1Un"/>
-                                            <constraint firstItem="Wib-02-9dq" firstAttribute="leading" secondItem="QsI-2P-QDa" secondAttribute="leading" id="RXk-Jh-Bye"/>
+                                            <constraint firstItem="Wib-02-9dq" firstAttribute="leading" secondItem="QsI-2P-QDa" secondAttribute="leading" constant="5" id="RXk-Jh-Bye"/>
                                             <constraint firstAttribute="trailing" secondItem="7Er-ld-5uZ" secondAttribute="trailing" id="TVb-Uu-sE4"/>
                                             <constraint firstAttribute="bottom" secondItem="Wib-02-9dq" secondAttribute="bottom" id="Wdi-Nt-TTK"/>
                                             <constraint firstAttribute="bottom" secondItem="7Er-ld-5uZ" secondAttribute="bottom" id="dqV-3e-91R"/>
@@ -495,10 +496,10 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="mVw-xI-3mn">
-                                <rect key="frame" x="16" y="403" width="449" height="54"/>
+                                <rect key="frame" x="16" y="401" width="449" height="51"/>
                                 <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DSM-Hq-Kyw">
-                                        <rect key="frame" x="-2" y="34" width="453" height="20"/>
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DSM-Hq-Kyw">
+                                        <rect key="frame" x="-2" y="31" width="453" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="bkw-lV-fQT"/>
                                         </constraints>
@@ -509,7 +510,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="c2Y-hb-2CY" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="376" y="2" width="73" height="23"/>
+                                        <rect key="frame" x="377" y="0.0" width="72" height="23"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="69" id="ZdS-vc-3EC"/>
                                         </constraints>
@@ -529,7 +530,7 @@
                                         </connections>
                                     </comboBox>
                                     <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ybI-lG-duP">
-                                        <rect key="frame" x="-2" y="-2" width="371" height="28"/>
+                                        <rect key="frame" x="-2" y="-3" width="371" height="28"/>
                                         <sliderCell key="cell" alignment="left" maxValue="1" tickMarkPosition="above" sliderType="linear" id="w59-cx-DIN"/>
                                         <connections>
                                             <action selector="opacitySliderAction:" target="-2" id="TFl-qU-6dK"/>
@@ -549,9 +550,9 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ylg-k5-0Xf">
-                                <rect key="frame" x="16" y="467" width="449" height="72"/>
+                                <rect key="frame" x="16" y="462" width="449" height="72"/>
                                 <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zk5-HT-4yl">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zk5-HT-4yl">
                                         <rect key="frame" x="-2" y="42" width="62" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="o4k-p8-u2b"/>
@@ -582,9 +583,9 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="29n-Jr-QG2">
-                                <rect key="frame" x="16" y="549" width="449" height="102"/>
+                                <rect key="frame" x="16" y="544" width="449" height="102"/>
                                 <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JsL-wX-Njt">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JsL-wX-Njt">
                                         <rect key="frame" x="-2" y="72" width="42" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="z6d-A9-0bg"/>
@@ -621,7 +622,7 @@
                                             </constraints>
                                         </view>
                                     </box>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n33-LV-rlJ">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n33-LV-rlJ">
                                         <rect key="frame" x="-2" y="42" width="52" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="3sz-hc-KDq"/>
@@ -645,10 +646,10 @@
                                 </constraints>
                             </customView>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="0Qb-jg-5Ce">
-                                <rect key="frame" x="16" y="20" width="449" height="131"/>
+                                <rect key="frame" x="16" y="20" width="449" height="129"/>
                                 <subviews>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="04S-yS-pWn">
-                                        <rect key="frame" x="-2" y="101" width="35" height="20"/>
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="04S-yS-pWn">
+                                        <rect key="frame" x="-2" y="99" width="35" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="20" id="c2U-EW-hwg"/>
                                         </constraints>
@@ -659,21 +660,24 @@
                                         </textFieldCell>
                                     </textField>
                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="82h-wT-aSq">
-                                        <rect key="frame" x="433" y="103" width="16" height="16"/>
-                                        <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="KMImageNameUXIconBtnFontsetNor" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Iae-nh-IMf">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
+                                        <rect key="frame" x="433" y="101" width="16" height="16"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="16" id="KAE-r0-pPR"/>
                                             <constraint firstAttribute="width" constant="16" id="fnd-vZ-GRz"/>
                                         </constraints>
+                                        <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="KMImageNameUXIconBtnFontsetNor" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="Iae-nh-IMf">
+                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
                                         <connections>
                                             <action selector="fontButtonAction:" target="-2" id="pke-Eb-3xP"/>
                                         </connections>
                                     </button>
                                     <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="VRm-2Z-yAc" customClass="KMPopUpButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="3" width="346" height="24"/>
+                                        <rect key="frame" x="0.0" y="1" width="346" height="24"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="24" id="QdD-zJ-eI1"/>
+                                        </constraints>
                                         <popUpButtonCell key="cell" type="square" title="UltraLight" bezelStyle="shadowlessSquare" alignment="left" lineBreakMode="truncatingTail" state="on" inset="2" arrowPosition="noArrow" selectedItem="Xj8-wD-Eo7" id="0e6-ZT-mEd">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -691,29 +695,26 @@
                                                 </items>
                                             </menu>
                                         </popUpButtonCell>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="24" id="QdD-zJ-eI1"/>
-                                        </constraints>
                                         <connections>
                                             <action selector="fontStylePopUpButtonAction:" target="-2" id="FbC-KN-6Ch"/>
                                         </connections>
                                     </popUpButton>
                                     <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="FBi-S9-RTC" customClass="KMPopUpButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="35" width="449" height="24"/>
+                                        <rect key="frame" x="0.0" y="33" width="449" height="24"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="24" id="svD-NU-tnJ"/>
+                                        </constraints>
                                         <popUpButtonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="left" lineBreakMode="truncatingTail" inset="2" arrowPosition="noArrow" id="Sh9-6x-k3S" customClass="KMPopUpButtonCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" usesAppearanceFont="YES"/>
                                             <menu key="menu" id="52H-Tg-hJy"/>
                                         </popUpButtonCell>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="24" id="svD-NU-tnJ"/>
-                                        </constraints>
                                         <connections>
                                             <action selector="fontPopUpButtonAction:" target="-2" id="D3z-rp-QdK"/>
                                         </connections>
                                     </popUpButton>
-                                    <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7m0-hp-PRc" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="353" y="3" width="96" height="23"/>
+                                    <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7m0-hp-PRc" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
+                                        <rect key="frame" x="354" y="1" width="95" height="23"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="92" id="QPh-ca-xew"/>
                                         </constraints>
@@ -750,7 +751,7 @@
                                         </connections>
                                     </comboBox>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="An2-NL-h4C" customClass="KMColorPickerView" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="69" width="449" height="32"/>
+                                        <rect key="frame" x="0.0" y="67" width="449" height="32"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="32" id="Qfn-a0-H2v"/>
                                         </constraints>