Browse Source

【UI替换】主页 - 显示间距细节调整

lizhe 1 year ago
parent
commit
4f53c57c79

+ 9 - 9
PDF Office/PDF Master/Class/Home/View/HomeContentView/QucikTools/KMQucikToolsView.swift

@@ -60,15 +60,15 @@ class KMQucikToolsView: KMBaseXibView {
 //Notification
 extension KMQucikToolsView  {
     @objc func scrollViewDidScroll(notification: Notification) {
-        // 处理滚动事件
-        if let scrollView = notification.object as? NSScrollView {
-            print("NSScrollView did scroll.")
-            // 获取滚动位置等信息
-            let contentOffset = scrollView.contentView.bounds.origin
-            print("Content Offset: \(contentOffset)")
-            
-        }
-        
+//        // 处理滚动事件
+//        if let scrollView = notification.object as? NSScrollView {
+//            print("NSScrollView did scroll.")
+//            // 获取滚动位置等信息
+//            let contentOffset = scrollView.contentView.bounds.origin
+//            print("Content Offset: \(contentOffset)")
+//            
+//        }
+//        
         guard let callBack = pageChange else { return }
         callBack(self)
     }

+ 2 - 2
PDF Office/PDF Master/Class/Home/ViewController/KMHomePopViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 8 - 8
PDF Office/PDF Master/Class/Home/ViewController/KMProductPromotionViewController.xib

@@ -1,12 +1,12 @@
 <?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="22155" 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="22155"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMProductPromotionViewController" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMProductPromotionViewController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="activitiesBox" destination="CxY-O0-Cyh" id="Tbm-K1-BO2"/>
                 <outlet property="activitiesCloseButton" destination="Qju-Te-5th" id="eV6-mm-onD"/>
@@ -20,7 +20,7 @@
             <rect key="frame" x="0.0" y="0.0" width="612" height="188"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="CxY-O0-Cyh" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="CxY-O0-Cyh" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                     <rect key="frame" x="0.0" y="0.0" width="612" height="188"/>
                     <view key="contentView" id="Cbo-eS-eTf">
                         <rect key="frame" x="0.0" y="0.0" width="612" height="188"/>
@@ -32,14 +32,14 @@
                             </imageView>
                             <button translatesAutoresizingMaskIntoConstraints="NO" id="Qju-Te-5th">
                                 <rect key="frame" x="577" y="151.5" width="30.5" height="34"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="30" id="3nJ-qp-c0X"/>
-                                    <constraint firstAttribute="height" constant="30" id="dQs-eI-ACu"/>
-                                </constraints>
                                 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="svV-sJ-Rzg">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="30" id="3nJ-qp-c0X"/>
+                                    <constraint firstAttribute="height" constant="30" id="dQs-eI-ACu"/>
+                                </constraints>
                                 <connections>
                                     <action selector="activitiesCloseButtonAction:" target="-2" id="0SA-cU-MfX"/>
                                 </connections>

+ 2 - 1
PDF Office/PDF Master/Class/KMAdvertisement/View/Tableview/KMAdvertisementTableView.swift

@@ -163,7 +163,8 @@ extension KMAdvertisementTableView: NSCollectionViewDataSource {
 extension KMAdvertisementTableView: NSCollectionViewDelegateFlowLayout {
     
     public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> NSSize {
-        return NSSize(width: self.contentView.bounds.width, height: 32)
+//        return NSSize(width: self.contentView.bounds.width, height: 32)
+        return NSSize(width: 238, height: 32)
     }
     
     public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> NSSize {

+ 2 - 2
PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditThumbnailItem.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22146" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22146"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>