From 4090a31ddf9a372141eb48ec717b77c66fdb4937 Mon Sep 17 00:00:00 2001 From: Yusuke Takahashi Date: Sat, 16 Sep 2017 22:42:47 +0900 Subject: [PATCH] Fix xib layout --- Classes/Popover.swift | 5 +++++ Example/Podfile.lock | 8 ++++---- Example/Popover.xcodeproj/project.pbxproj | 8 +++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Classes/Popover.swift b/Classes/Popover.swift index aa7b316..4359f9c 100644 --- a/Classes/Popover.swift +++ b/Classes/Popover.swift @@ -124,6 +124,11 @@ open class Popover: UIView { fatalError("init(coder:) has not been implemented") } + override open func layoutSubviews() { + super.layoutSubviews() + self.contentView.frame = self.bounds + } + fileprivate func create() { var frame = self.contentView.frame frame.origin.x = self.arrowShowPoint.x - frame.size.width * 0.5 diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 41b447d..27e93c3 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - Popover (1.0.4) + - Popover (1.0.6) DEPENDENCIES: - Popover (from `../`) EXTERNAL SOURCES: Popover: - :path: "../" + :path: ../ SPEC CHECKSUMS: - Popover: b6999e0625b690f455d0bb031b97ff5f39f33a29 + Popover: f811ed4eb4c4843d7bfff357816ed0d97c4ba69e PODFILE CHECKSUM: 6d2f20b0ca605fb4d048b05500bed6d649d9a399 -COCOAPODS: 1.2.0 +COCOAPODS: 1.3.1 diff --git a/Example/Popover.xcodeproj/project.pbxproj b/Example/Popover.xcodeproj/project.pbxproj index 928265e..a1a8bfa 100644 --- a/Example/Popover.xcodeproj/project.pbxproj +++ b/Example/Popover.xcodeproj/project.pbxproj @@ -266,9 +266,12 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-PopoverExample/Pods-PopoverExample-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Popover/Popover.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Popover.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -281,13 +284,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PopoverExample-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */