Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from objective-see:master #18

Merged
merged 5 commits into from
Aug 29, 2024
Merged

[pull] master from objective-see:master #18

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
982f55b
passive mode + block
objective-see Aug 27, 2024
f0a64f3
popover improvements
objective-see Aug 27, 2024
48734e4
Improvements to Passive mode (#625)
objective-see Aug 27, 2024
fcebafd
passive mode: create rules
objective-see Aug 28, 2024
9df2e9c
rules sorting, and other UI improvements
objective-see Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
popover improvements
  • Loading branch information
@objective-see
objective-see committed Aug 27, 2024
commit f0a64f3f297db968769ece8754286f823882573e
2 changes: 1 addition & 1 deletion LuLu/App/StatusBarItem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#import "RulesMenuController.h"

@interface StatusBarItem : NSObject <NSPopoverDelegate>
@interface StatusBarItem : NSObject <NSPopoverDelegate, NSMenuDelegate>
{

}
Expand Down
17 changes: 16 additions & 1 deletion LuLu/App/StatusBarItem.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,30 @@ -(void)createStatusItem:(NSMenu*)menu
//init status item
statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];

//set menu
//set menu / delegate
self.statusItem.menu = menu;
self.statusItem.menu.delegate = self;

//set handler for each menu item
[self setMenuHandler:menu];

return;
}

//menu 'will open' delegate
// make sure popover is closed
-(void)menuWillOpen:(NSMenu *)menu
{
//make sure to close popover first
if(YES == self.popover.shown)
{
//close
[self.popover performClose:nil];
}

return;
}

//set handler for menu item(s)
-(void)setMenuHandler:(NSMenu*)menu
{
Expand Down