Merge branch 'develop_2025' of git.kdan.cc:Mac_PDF/PDF_Office into develop_2025

PDF Office/PDF Master/KMClass/Left/Annotaion/View/KMNoteFooterCellView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -16,17 +16,17 @@
                 <box borderType="line" title="Box" titlePosition="noTitle" transparent="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Zps-kZ-RvQ">
                     <rect key="frame" x="-3" y="34" width="459" height="76"/>
                     <view key="contentView" id="fr9-7p-tnW">
-                        <rect key="frame" x="3" y="3" width="453" height="70"/>
+                        <rect key="frame" x="4" y="5" width="451" height="68"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="nRc-Dh-PEL" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                <rect key="frame" x="20" y="38" width="421" height="32"/>
+                                <rect key="frame" x="20" y="36" width="419" height="32"/>
                                 <view key="contentView" id="fIS-wd-lpj">
-                                    <rect key="frame" x="1" y="1" width="419" height="30"/>
+                                    <rect key="frame" x="1" y="1" width="417" height="30"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="HuQ-4F-E6t" customClass="KMTextField" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                            <rect key="frame" x="4" y="7" width="411" height="16"/>
+                                            <rect key="frame" x="4" y="7" width="409" height="16"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="6De-hm-do0">
                                                 <font key="font" usesAppearanceFont="YES"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -45,14 +45,14 @@
                                 </constraints>
                             </box>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cqz-a4-FAh">
-                                <rect key="frame" x="327" y="6" width="45" height="20"/>
+                                <rect key="frame" x="325" y="6" width="45" height="14"/>
                                 <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="ZIH-CU-juN">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
                             <box boxType="custom" borderType="line" borderWidth="0.0" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="cRx-uY-ael">
-                                <rect key="frame" x="384" y="3" width="57" height="28"/>
+                                <rect key="frame" x="382" y="1" width="57" height="28"/>
                                 <view key="contentView" id="B99-lm-QE0">
                                     <rect key="frame" x="0.0" y="0.0" width="57" height="28"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -76,7 +76,7 @@
                         </subviews>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="nRc-Dh-PEL" secondAttribute="trailing" constant="12" id="0Ur-tE-yDr"/>
-                            <constraint firstItem="cqz-a4-FAh" firstAttribute="top" secondItem="nRc-Dh-PEL" secondAttribute="bottom" constant="12" id="CkL-Wf-SbD"/>
+                            <constraint firstItem="cqz-a4-FAh" firstAttribute="top" secondItem="nRc-Dh-PEL" secondAttribute="bottom" constant="16" id="CkL-Wf-SbD"/>
                             <constraint firstAttribute="trailing" secondItem="cRx-uY-ael" secondAttribute="trailing" constant="12" id="E8c-fj-OFJ"/>
                             <constraint firstItem="nRc-Dh-PEL" firstAttribute="top" secondItem="fr9-7p-tnW" secondAttribute="top" id="JUc-qE-48C"/>
                             <constraint firstItem="nRc-Dh-PEL" firstAttribute="leading" secondItem="fr9-7p-tnW" secondAttribute="leading" constant="20" id="Sn4-P3-Sde"/>
@@ -105,14 +105,14 @@
                             </imageView>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uM3-3G-Uw3" customClass="KMCoverButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="1" width="20" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="20" id="GAQ-OB-ec7"/>
-                                    <constraint firstAttribute="height" constant="20" id="qJi-kT-oQ6"/>
-                                </constraints>
                                 <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="RMl-bc-0EZ">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="20" id="GAQ-OB-ec7"/>
+                                    <constraint firstAttribute="height" constant="20" id="qJi-kT-oQ6"/>
+                                </constraints>
                             </button>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7m2-cH-Gl5">
                                 <rect key="frame" x="0.0" y="0.0" width="22" height="22"/>

PDF Office/PDF Master/KMClass/Left/Search/Controller/KMBotaSearchViewController.swift

@@ -994,7 +994,7 @@ extension KMBotaSearchViewController: ComponentGroupDelegate {
                 
                 currentSel = nil
                 currentModel_ = nil
-                if let data = topContentView_?.inputValue, data.isEmpty {
+                if let data = topContentView_?.inputValue, data.isEmpty == false {
                     search(keyword: data) { [weak self] results in }
                 }
             } else if idx == 4 {
@@ -1004,7 +1004,7 @@ extension KMBotaSearchViewController: ComponentGroupDelegate {
                 
                 currentSel = nil
                 currentModel_ = nil
-                if let data = topContentView_?.inputValue, data.isEmpty {
+                if let data = topContentView_?.inputValue, data.isEmpty == false {
                     search(keyword: data) { [weak self] results in }
                 }
             }