Browse Source

【综合】比较表类型调整

tangchao 2 months ago
parent
commit
12d7d08c96

+ 8 - 8
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -218,10 +218,10 @@ NSPopoverDelegate>
 
     CGFloat buttonWidth = CGRectGetMaxX(self.button.frame);
     NSRect btnRect = [self.button.attributedTitle boundingRectWithSize:CGSizeMake(MAXFLOAT, CGRectGetHeight(self.button.frame)) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading];
-    if (fabs(buttonWidth-btnRect.size.width)>50) {
-//        buttonWidth = btnRect.size.width + 10;
-        buttonWidth += 10;
-    }
+//    if (fabs(buttonWidth-btnRect.size.width)>50) {
+        buttonWidth = btnRect.size.width + 10;
+//        buttonWidth += 10;
+//    }
     
     CGFloat officeWidth = CGRectGetMaxX(self.officeButton.frame);
     NSRect officeRect = [self.officeButton.attributedTitle boundingRectWithSize:CGSizeMake(MAXFLOAT, CGRectGetHeight(self.officeButton.frame)) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading];
@@ -474,10 +474,10 @@ NSPopoverDelegate>
         
         buttonWidth = CGRectGetWidth(self.button.frame);
         NSRect btnRect = [self.button.attributedTitle boundingRectWithSize:CGSizeMake(MAXFLOAT, CGRectGetHeight(self.button.frame)) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading];
-        if (fabs(buttonWidth-btnRect.size.width)>50) {
-//            buttonWidth = btnRect.size.width + 10;
-            buttonWidth += 10;
-        }
+//        if (fabs(buttonWidth-btnRect.size.width)>50) {
+            buttonWidth = btnRect.size.width + 10;
+//            buttonWidth += 10;
+//        }
         if (KMAdvertisementManager.manager.info.topRightInfoContent != nil) {
             if (KMAdvertisementManager.manager.info.topRightInfoContent.content.firstObject != nil) {
                 buttonWidth += 10;

+ 3 - 4
PDF Office/PDF Master/MemberCenter/Model/KMMemberInfo.swift

@@ -943,10 +943,9 @@ import Cocoa
             }
             
             // 是 AppStore 免费版
-//            KMProductCompareWC.shared.orientation = true
-//            KMProductCompareWC.shared.orientationType = .lite_Base
-//            KMProductCompareWC.shared.openWindow(type: type)
-            productCompareShow()
+            KMProductCompareWC.shared.orientation = true
+            KMProductCompareWC.shared.orientationType = .lite_Base
+            KMProductCompareWC.shared.showWindow(nil)
         }
     }