Changeset 595 for trunk

Timestamp:

12/21/09 22:11:47 (15 years ago)

Author:

Nicholas Riley

Message:

Keyboard-accessible and better-behaving volume slider.

Location:

trunk/Cocoa/Pester/Source

Files:

• English.lproj/Volume.nib/classes.nib (deleted)
• English.lproj/Volume.nib/designable.nib (added)
• English.lproj/Volume.nib/info.nib (deleted)
• English.lproj/Volume.nib/keyedobjects.nib (added)
• English.lproj/Volume.nib/objects.nib (deleted)
• NJRMenuSlider.h (added)
• NJRMenuSlider.m (added)
• PSVolumeController.m (modified) (3 diffs)
• Pester.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSVolumeController.m

@@ -10 +10 @@
 #import "NJRSoundManager.h"
 #import "NJRNonCenteringWindow.h"
+#include <Carbon/Carbon.h>
 
 @interface NSMenu (SnowLeopardAdditions)
@@ -56 +57 @@
             }
             [menu setAllowsContextMenuPlugIns: NO];
+            // replace with http://waffle.wootest.net/2007/08/07/popping-up-a-menu-in-cocoa/
             [menu popUpMenuPositioningItem: nil atLocation: point inView: view];
             [menu release];
@@ -100 +102 @@
 - (IBAction)volumeSet:(NSSlider *)sender;
 {
+    // XXX don't delay preview for keyboard adjustment
     [delegate volumeController: self didSetVolume: [sender floatValue]];
-    if (NSEventMaskFromType([[NSApp currentEvent] type]) & (NSLeftMouseUpMask | NSRightMouseUpMask | NSOtherMouseUpMask))
+    NSLog(@"%@", [NSApp currentEvent]);
+    unsigned eventMask = NSEventMaskFromType([[NSApp currentEvent] type]);
+    // The event may simply be a mouse-up: close the menu.
+    if (eventMask & (NSLeftMouseUpMask | NSRightMouseDownMask | NSOtherMouseDownMask))
+        [menu cancelTracking];
+    // On a quick click, the event may be a mouse down but the mouse button is no longer down.
+    if (!(eventMask & (NSLeftMouseDownMask | NSRightMouseDownMask | NSOtherMouseDownMask)))
+        return;
+    // 10.6+: use [NSEvent pressedMouseButtons] instead
+    if (GetCurrentButtonState() == 0)
         [menu cancelTracking];
 }

trunk/Cocoa/Pester/Source/Pester.xcodeproj/project.pbxproj

@@ -8 +8 @@
 
 /* Begin PBXBuildFile section */
+                E12CBFD310CC310800159E88 /* NJRMenuSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = E12CBFD210CC310800159E88 /* NJRMenuSlider.m */; };
                 E15044670CFCDC7E00DE47E9 /* NJRValidatingField.m in Sources */ = {isa = PBXBuildFile; fileRef = E15044660CFCDC7E00DE47E9 /* NJRValidatingField.m */; };
                 E17562620CF8C50B00FC5057 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E17562610CF8C50B00FC5057 /* Sparkle.framework */; };
@@ -185 +186 @@
                 E127900C0442A92900050002 /* PSVolumeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSVolumeController.h; sourceTree = "<group>"; };
                 E127900D0442A92900050002 /* PSVolumeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSVolumeController.m; sourceTree = "<group>"; };
+                E12CBFD110CC310800159E88 /* NJRMenuSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJRMenuSlider.h; sourceTree = "<group>"; };
+                E12CBFD210CC310800159E88 /* NJRMenuSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJRMenuSlider.m; sourceTree = "<group>"; };
                 E130B9AC03B7C59700000028 /* PSPowerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PSPowerManager.h; sourceTree = "<group>"; };
                 E130B9AD03B7C59700000028 /* PSPowerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PSPowerManager.m; sourceTree = "<group>"; };
@@ -671 +674 @@
                                 F5F240B6036A862101FE7503 /* NJRFSObjectSelector.h */,
                                 F5F240B5036A862101FE7503 /* NJRFSObjectSelector.m */,
+                                E12CBFD110CC310800159E88 /* NJRMenuSlider.h */,
+                                E12CBFD210CC310800159E88 /* NJRMenuSlider.m */,
                                 F5F240CD036A877301FE7503 /* NJRQTMediaPopUpButton.h */,
                                 F5F240CC036A877301FE7503 /* NJRQTMediaPopUpButton.m */,
@@ -938 +943 @@
                                 E1B121970CF62FD1004975AA /* NSMenuItem-NJRExtensions.m in Sources */,
                                 E15044670CFCDC7E00DE47E9 /* NJRValidatingField.m in Sources */,
+                                E12CBFD310CC310800159E88 /* NJRMenuSlider.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;