【综合】toolbar调整UI

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarView.swift

@@ -265,14 +265,12 @@ private let KMToolbarItemSpace = 8.0
                     })
                 } else {
                     if itemIdentifier == KMNewToolbarSpaceItemIdentifier {
-//                    if ([itemIdentifier isEqualToString:]) {
                         item?.mas_makeConstraints({ make in
                             make?.top.bottom().equalTo()(0)
                             make?.left.equalTo()(lastItem!.mas_right)?.offset()(2)
                         })
                     } else {
                         if lastItem?.itemIdentifier == KMNewToolbarSpaceItemIdentifier {
-//                        if ([lastItem.itemIdentifier isEqualToString:]) {
                             item?.mas_makeConstraints({ make in
                                 make?.top.bottom().equalTo()(0)
                                 make?.left.equalTo()(lastItem!.mas_right)?.offset()(2)
@@ -428,14 +426,14 @@ private let KMToolbarItemSpace = 8.0
                 if (lastItem != nil) {
                     if (i == itemIdentifiers.count - 1) {
                         item?.mas_makeConstraints({ make in
-                            make?.top.equalTo()(0)
+                            make?.height.offset()(44)
                             make?.bottom.equalTo()(0)
                             make?.left.equalTo()(lastItem!.mas_right)?.offset()(KMToolbarItemSpace)
                             make?.right.equalTo()(self.rightView.mas_right)?.offset()(-20)
                         })
                     } else {
                         item?.mas_makeConstraints({ make in
-                            make?.top.equalTo()(0)
+                            make?.height.offset()(44)
                             make?.bottom.equalTo()(0)
                             make?.left.equalTo()(lastItem!.mas_right)?.offset()(KMToolbarItemSpace)
                         })
@@ -443,14 +441,14 @@ private let KMToolbarItemSpace = 8.0
                 } else {
                     if (i == itemIdentifiers.count - 1) {
                         item?.mas_makeConstraints({ make in
-                            make?.top.equalTo()(0)
                             make?.bottom.equalTo()(0)
+                            make?.height.offset()(44)
                             make?.left.equalTo()(self.rightView.mas_left)?.offset()(KMToolbarItemSpace)
                             make?.right.equalTo()(self.rightView.mas_right)?.offset()(-20)
                         })
                     } else {
                         item?.mas_makeConstraints({ make in
-                            make?.top.equalTo()(0)
+                            make?.height.offset()(44)
                             make?.bottom.equalTo()(0)
                             make?.left.equalTo()(0)
                         })
@@ -543,7 +541,7 @@ private let KMToolbarItemSpace = 8.0
                 make?.centerY.equalTo()(0)
             }
         } else {
-            frame.origin.x = leftButtonWidth
+//            frame.origin.x = leftButtonWidth
             self.moreButton.mas_makeConstraints { make in
                 make?.top.bottom().equalTo()(0)
                 make?.width.offset()(moreButtonWidth)