nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-22 15:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Menu items now correclty toggel search flags, not only buttons.

Browse Source 
UI is still a bit broken, but functional
This commit is contained in:
Michael Starke
2018-08-23 18:59:43 +02:00
parent 187e77f9ff
commit eb8c5c4749
3 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MacPass/MPDocument+Search.m
View File

@@ -87,13 +87,24 @@ NSString *const kMPDocumentSearchResultsKey = @"kMPDocumentSearchResul
MPEntrySearchFlags toggleFlag = [sender tag];
MPEntrySearchFlags newFlags = MPEntrySearchNone;
BOOL isSingleFlag = toggleFlag & MPEntrySearchSingleFlags;
NSButton *button = sender;
switch(button.state) {
case NSOffState:
NSControlStateValue state;
if([sender isKindOfClass:NSButton.class]) {
state = ((NSButton *)sender).state;
}
else {
NSAssert([sender isKindOfClass:NSMenuItem.class], @"Internal inconsitency. Did expect NSMenuItem expected, but got %@", [sender class]);
state = ((NSMenuItem *)sender).state;
/* Manually toggle the state since the popupbuttoncell doesn't do it like we want it to */
state = state == NSControlStateValueOn ? NSControlStateValueOff : NSControlStateValueOn;
}
switch(state) {
case NSControlStateValueOff:
toggleFlag ^= MPEntrySearchAllCombineableFlags;
newFlags = isSingleFlag ? MPEntrySearchNone : (self.searchContext.searchFlags & toggleFlag);
break;
case NSOnState:
case NSControlStateValueOn:
if(isSingleFlag ) {
newFlags = toggleFlag; // This has to be either expired or double passwords
}