Release 1.3.0 (#52)

tanin47 · May 17, 2020 · 6122112 · 6122112
1 parent 49fe112
commit 6122112
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/mac-app/Tip/Info.plist b/mac-app/Tip/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0-rc2</string>
+	<string>1.3.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>7</string>
+	<string>8</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/mac-app/Tip/TipItemTextField.m b/mac-app/Tip/TipItemTextField.m
@@ -20,6 +20,11 @@ - (instancetype)init {
         self.drawsBackground = NO;
         self.font = [NSFont fontWithName:@"RobotoMono-Regular" size:12];
         self.lineBreakMode = NSLineBreakByTruncatingTail;
+
+        [self setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
+        [self setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
+        [self setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
+        [self setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
     }
     return self;
 }

diff --git a/mac-app/Tip/TipNoticeView.m b/mac-app/Tip/TipNoticeView.m
@@ -15,6 +15,10 @@ @implementation TipNoticeView
 - (instancetype)init{
     if (self = [super init]) {
         self.translatesAutoresizingMaskIntoConstraints = NO;
+        [self setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
+        [self setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
+        [self setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
+        [self setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
 
         _iconField = [[NSTextField alloc] init];
         _iconField.identifier = @"iconField";

diff --git a/mac-app/Tip/TipTableController.m b/mac-app/Tip/TipTableController.m
@@ -24,21 +24,13 @@ - (instancetype)init {
         NSDictionary *noticeViewDict = NSDictionaryOfVariableBindings(_noticeView);
         [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(>=2)-[_noticeView]-(>=2)-|" options:0 metrics:nil views:noticeViewDict]];
         [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(>=2)-[_noticeView]-(>=2)-|" options:0 metrics:nil views:noticeViewDict]];
-        [_noticeView setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
-        [_noticeView setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
-        [_noticeView setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
-        [_noticeView setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
 
         _table = [[TipTableView alloc] init];
         [self.view addSubview:_table];
 
         NSDictionary *tableDict = NSDictionaryOfVariableBindings(_table);
         [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-0-[_table]-0-|" options:0 metrics:nil views:tableDict]];
         [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-0-[_table]-0-|" options:0 metrics:nil views:tableDict]];
-        [_table setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
-        [_table setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
-        [_table setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
-        [_table setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
     }
     return self;
 }

diff --git a/mac-app/Tip/TipTableView.m b/mac-app/Tip/TipTableView.m
@@ -35,6 +35,11 @@ - (instancetype)init {
         self.target = self;
         self.action = @selector(clickRow:);
 
+        [self setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
+        [self setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
+        [self setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
+        [self setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
+
         _iconColumn = [[NSTableColumn alloc] initWithIdentifier:@"icon"];
         _iconColumn.width = 18;
         _textColumn = [[NSTableColumn alloc] initWithIdentifier:@"text"];
@@ -184,10 +189,6 @@ - (nullable NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(null
             NSDictionary *textDict = NSDictionaryOfVariableBindings(text);
             [textCol addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-0-[text]-0-|" options:0 metrics:nil views:textDict]];
             [textCol addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-1-[text]-4-|" options:0 metrics:nil views:textDict]];
-            [text setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
-            [text setContentCompressionResistancePriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
-            [text setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationVertical];
-            [text setContentHuggingPriority:NSLayoutPriorityRequired forOrientation:NSLayoutConstraintOrientationHorizontal];
         }
 
         NSTextField* textField = textCol.subviews.firstObject;