Add quark.togglePopup().

This commit is contained in:
LIU Dongyuan / 柳东原
2015-09-06 22:46:24 +08:00
parent 5d28894c7a
commit 8d14770c32
6 changed files with 23 additions and 10 deletions

View File

@@ -47,7 +47,7 @@ quark.setupPreferences([
quark.addKeyboardShortcut({
keycode: keycode,
modifierFlags: modifierFlags,
callback: function () { quark.openPopup() }
callback: function () { quark.togglePopup() }
})
}
}

View File

@@ -36,6 +36,7 @@ quark.debug = true
// Open/close the popup window
quark.openPopup()
quark.closePopup()
quark.togglePopup()
// Quit application
quark.quit()
@@ -124,7 +125,7 @@ quark.addKeyboardShortcut({
modifierFlags: 0, // no modifier key
callback: function suchCallback() {
console.log("wow")
quark.openPopup()
quark.togglePopup()
}
})

View File

@@ -18,5 +18,6 @@
- (void)showWindow;
- (void)hideWindow;
- (void)toggleWindow;
@end

View File

@@ -116,6 +116,16 @@
[self.window fadeOut];
}
- (void)toggleWindow
{
if (self.window.visible) {
[self hideWindow];
}
else {
[self showWindow];
}
}
- (void)statusItemClicked
{
const NSUInteger buttonMask = [NSEvent pressedMouseButtons];
@@ -132,12 +142,7 @@
}
}
if (self.window.visible) {
[self hideWindow];
}
else {
[self showWindow];
}
[self toggleWindow];
}
- (void)refreshStyle

View File

@@ -66,6 +66,7 @@ static const NSInteger kPreferencesDefaultHeight = 192;
{
if (selector == @selector(openPopup) ||
selector == @selector(closePopup) ||
selector == @selector(togglePopup) ||
selector == @selector(quit) ||
selector == @selector(openURL:) ||
selector == @selector(changeIcon:) ||
@@ -177,6 +178,11 @@ static const NSInteger kPreferencesDefaultHeight = 192;
[self.appDelegate hideWindow];
}
- (void)togglePopup
{
[self.appDelegate toggleWindow];
}
- (void)quit
{
[NSApp terminate:nil];

View File

@@ -9,7 +9,7 @@ $(function() {
modifierFlags: 0, // no modifier key
callback: function () {
console.log("wow")
quark.openPopup()
quark.togglePopup()
}
})
@@ -40,7 +40,7 @@ $(function() {
modifierFlags: modifierFlags,
callback: function () {
console.log("wow")
quark.openPopup()
quark.togglePopup()
}
})
}