From 33a4188bba3251f3e1e45d5b7875b37f01923a8a Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Fri, 1 Oct 2021 13:28:28 +0200
Subject: [PATCH] Fixed squashed password input field

---
 MacPass/Base.lproj/PasswordEditWindow.xib    | 34 ++++++++++----------
 MacPassTests/MPTestPluginVersionComparator.m |  1 +
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/MacPass/Base.lproj/PasswordEditWindow.xib b/MacPass/Base.lproj/PasswordEditWindow.xib
index 96ccc792..b1650a7c 100644
--- a/MacPass/Base.lproj/PasswordEditWindow.xib
+++ b/MacPass/Base.lproj/PasswordEditWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -24,10 +24,10 @@
         <window title="Change Password" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="1090" y="652" width="369" height="164"/>
+            <rect key="contentRect" x="1090" y="652" width="446" height="307"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <view key="contentView" verticalHuggingPriority="251" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="369" height="213"/>
+                <rect key="frame" x="0.0" y="0.0" width="369" height="217"/>
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="68">
                         <rect key="frame" x="212" y="13" width="144" height="32"/>
@@ -52,8 +52,8 @@ Gw
                             <action selector="cancel:" target="-2" id="84"/>
                         </connections>
                     </button>
-                    <gridView horizontalHuggingPriority="251" verticalHuggingPriority="750" ambiguous="YES" xPlacement="leading" yPlacement="bottom" rowAlignment="none" translatesAutoresizingMaskIntoConstraints="NO" id="0Iv-td-ACj">
-                        <rect key="frame" x="20" y="60" width="329" height="133"/>
+                    <gridView horizontalHuggingPriority="251" verticalHuggingPriority="750" xPlacement="leading" yPlacement="bottom" rowAlignment="none" translatesAutoresizingMaskIntoConstraints="NO" id="0Iv-td-ACj">
+                        <rect key="frame" x="20" y="60" width="329" height="137"/>
                         <rows>
                             <gridRow id="Ljm-xA-9NW"/>
                             <gridRow id="Dv9-ND-6rX"/>
@@ -70,8 +70,8 @@ Gw
                         <gridCells>
                             <gridCell row="Ljm-xA-9NW" column="uaf-ph-2zN" id="1U3-Im-v9n"/>
                             <gridCell row="Ljm-xA-9NW" column="7oF-Xq-5de" id="2bp-dG-V6t">
-                                <textField key="contentView" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="12">
-                                    <rect key="frame" x="90" y="119" width="204" height="14"/>
+                                <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12">
+                                    <rect key="frame" x="90" y="123" width="204" height="14"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="PASSWORD_ERROR" id="14">
                                         <font key="font" metaFont="smallSystem"/>
                                         <color key="textColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -81,8 +81,8 @@ Gw
                             </gridCell>
                             <gridCell row="Ljm-xA-9NW" column="clB-mU-Eba" id="blk-az-oHS"/>
                             <gridCell row="Dv9-ND-6rX" column="uaf-ph-2zN" id="JUU-XQ-60P">
-                                <button key="contentView" horizontalHuggingPriority="252" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yKc-I9-uzv">
-                                    <rect key="frame" x="-2" y="92" width="88" height="22"/>
+                                <button key="contentView" horizontalHuggingPriority="252" translatesAutoresizingMaskIntoConstraints="NO" id="yKc-I9-uzv">
+                                    <rect key="frame" x="-2" y="96" width="88" height="22"/>
                                     <buttonCell key="cell" type="check" title="Password:" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="OQz-DA-SoY">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                         <font key="font" metaFont="system"/>
@@ -90,8 +90,8 @@ Gw
                                 </button>
                             </gridCell>
                             <gridCell row="Dv9-ND-6rX" column="7oF-Xq-5de" id="cw2-er-epO">
-                                <secureTextField key="contentView" horizontalHuggingPriority="253" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9" customClass="HNHUISecureTextField">
-                                    <rect key="frame" x="92" y="93" width="200" height="20"/>
+                                <secureTextField key="contentView" horizontalHuggingPriority="253" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9" customClass="HNHUISecureTextField">
+                                    <rect key="frame" x="92" y="97" width="200" height="20"/>
                                     <constraints>
                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="gTV-5A-Fyo"/>
                                     </constraints>
@@ -106,8 +106,8 @@ Gw
                                 </secureTextField>
                             </gridCell>
                             <gridCell row="Dv9-ND-6rX" column="clB-mU-Eba" id="ykQ-xV-MfJ">
-                                <button key="contentView" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7">
-                                    <rect key="frame" x="291" y="86" width="45" height="32"/>
+                                <button key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7">
+                                    <rect key="frame" x="291" y="90" width="45" height="32"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="31" id="59"/>
                                     </constraints>
@@ -128,8 +128,8 @@ Gw
                                 </textField>
                             </gridCell>
                             <gridCell row="mNb-JP-3YX" column="7oF-Xq-5de" id="OBv-b8-DJs">
-                                <secureTextField key="contentView" verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="11" customClass="HNHUISecureTextField">
-                                    <rect key="frame" x="92" y="71" width="200" height="16"/>
+                                <secureTextField key="contentView" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="11" customClass="HNHUISecureTextField">
+                                    <rect key="frame" x="92" y="71" width="200" height="20"/>
                                     <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Repeat Password" drawsBackground="YES" usesSingleLineMode="YES" id="15">
                                         <font key="font" size="13" name="Menlo-Regular"/>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -213,7 +213,7 @@ Gw
                     <constraint firstItem="68" firstAttribute="top" secondItem="0Iv-td-ACj" secondAttribute="bottom" constant="20" symbolic="YES" id="s84-KY-RXX"/>
                 </constraints>
             </view>
-            <point key="canvasLocation" x="-295" y="-412"/>
+            <point key="canvasLocation" x="-272" y="-447.5"/>
         </window>
     </objects>
     <resources>
diff --git a/MacPassTests/MPTestPluginVersionComparator.m b/MacPassTests/MPTestPluginVersionComparator.m
index d3275f4f..a67345a6 100644
--- a/MacPassTests/MPTestPluginVersionComparator.m
+++ b/MacPassTests/MPTestPluginVersionComparator.m
@@ -63,6 +63,7 @@
   XCTAssertEqual(NSOrderedSame, [MPPluginVersionComparator compareVersion:@"0.9.89" toVersion:@"0.9.89"]);
   XCTAssertEqual(NSOrderedSame, [MPPluginVersionComparator compareVersion:@"1.*" toVersion:@"1.*.1"]);
   XCTAssertEqual(NSOrderedSame, [MPPluginVersionComparator compareVersion:@"1.*.2" toVersion:@"1.*"]);
+  XCTAssertEqual(NSOrderedSame, [MPPluginVersionComparator compareVersion:@"1.0" toVersion:@"1"]);
   XCTAssertEqual(NSOrderedSame, [MPPluginVersionComparator compareVersion:@"1.0" toVersion:@"1."]);
   XCTAssertEqual(NSOrderedSame, [MPPluginVersionComparator compareVersion:@"1.0" toVersion:@"1.0.0"]);
   XCTAssertEqual(NSOrderedSame, [MPPluginVersionComparator compareVersion:@"1.0" toVersion:@"1.0.0.0.0.0.0.0"]);