nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 21:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes search field (Issue #65)

Browse Source
This commit is contained in:
Frank Enderle
2013-12-08 00:37:41 +01:00
parent 8bb2428a96
commit 7215677b86
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MacPass/FilterBar.xib
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES"> <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A2093" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies> <dependencies>
<deployment defaultVersion="1080" identifier="macosx"/> <deployment defaultVersion="1080" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/> <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
@@ -87,6 +87,9 @@
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/> <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/> <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</searchFieldCell> </searchFieldCell>
<connections>
<outlet property="delegate" destination="-2" id="Y78-7K-e9c"/>
</connections>
</searchField> </searchField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="96"> <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="96">
<rect key="frame" x="238" y="6" width="74" height="17"/> <rect key="frame" x="238" y="6" width="74" height="17"/>

15
MacPass/MPEntryViewController.m
View File

@@ -342,6 +342,10 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
#pragma mark Filtering #pragma mark Filtering
- (void)showFilter:(id)sender { - (void)showFilter:(id)sender {
if([self _showsFilterBar]) {
[self.filterSearchField selectText:self];
}
[self _showFilterBarAnimated]; [self _showFilterBarAnimated];
} }
@@ -410,6 +414,17 @@ NSString *const _MPTAbleSecurCellView = @"PasswordCell";
self.filter = [self.filterSearchField stringValue]; self.filter = [self.filterSearchField stringValue];
} }
- (BOOL)control:(NSControl*)control textView:(NSTextView*)textView doCommandBySelector:(SEL)commandSelector
{
if (commandSelector == @selector(insertNewline:))
{
self.filter = [self.filterSearchField stringValue];
}
return NO;
}
- (void)_setupFilterBar { - (void)_setupFilterBar {
if(!self.filterBar) { if(!self.filterBar) {
/* /*