gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-20 21:56:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSColorPanel.m (-_magnify:): Preliminary implementation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@33510 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Eric Wasylishen 2011-07-11 06:25:29 +00:00
parent 56bf8c17be
commit 7005abd617
2 changed files with 48 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2011-07-11 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSColorPanel.m (-_magnify:): Preliminary implementation
2011-07-10 Eric Wasylishen <ewasylishen@gmail.com>
* Source/NSMenuView.m (-_trackWithEvent:): Fix for the bug where

46
Source/NSColorPanel.m
View file

@ -29,6 +29,7 @@
#import "config.h"
#import <Foundation/NSBundle.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSException.h>
#import <Foundation/NSFileManager.h>
#import <Foundation/NSLock.h>
#import <Foundation/NSNotification.h>
@ -41,6 +42,7 @@
#import "AppKit/NSColorPicker.h"
#import "AppKit/NSColorPicking.h"
#import "AppKit/NSColorWell.h"
#import "AppKit/NSCursor.h"
#import "AppKit/NSEvent.h"
#import "AppKit/NSGraphics.h"
#import "AppKit/NSImage.h"
@ -48,10 +50,13 @@
#import "AppKit/NSPasteboard.h"
#import "AppKit/NSPanel.h"
#import "AppKit/NSSlider.h"
#import "AppKit/NSScreen.h"
#import "AppKit/NSSplitView.h"
#import "AppKit/NSWindow.h"
#import "GNUstepGUI/GSDisplayServer.h"
#import "GNUstepGUI/IMLoading.h"
#import "GSGuiPrivate.h"
#define MAX_ALPHA_VALUE 100.0
@ -83,6 +88,7 @@ static int _gs_gui_color_picker_mode = NSRGBModeColorPanel;
- (void) _setupPickers;
- (void) _showNewPicker: (id)sender;
- (id) _initWithoutGModel;
- (void) _magnify: (id)sender;
@end
@implementation NSColorPanel (PrivateMethods)
@ -363,9 +369,45 @@ static int _gs_gui_color_picker_mode = NSRGBModeColorPanel;
[NSApp sendAction: _action to: _target from: self];
}
- (void) _maginify: (id) sender
- (void) _magnify: (id) sender
{
NSLog(@"Magnification is not implemented");
NSEvent *currentEvent;
[self _captureMouse: self];
[[NSCursor crosshairCursor] push];
NS_DURING
{
do {
NSPoint mouseLoc;
NSImage *img;
currentEvent = [NSApp nextEventMatchingMask: NSLeftMouseDownMask | NSLeftMouseUpMask | NSMouseMovedMask
untilDate: [NSDate distantFuture]
inMode: NSEventTrackingRunLoopMode
dequeue: YES];
mouseLoc = [self convertBaseToScreen: [self mouseLocationOutsideOfEventStream]];
img = [GSCurrentServer() contentsOfScreen: [[self screen] screenNumber]
inRect: NSMakeRect(mouseLoc.x, mouseLoc.y, 1, 1)];
if (img != nil)
{
NSBitmapImageRep *rep = (NSBitmapImageRep *)[img bestRepresentationForDevice: nil];
NSColor *color = [rep colorAtX: 0 y: 0];
[self setColor: color];
}
} while ([currentEvent type] != NSLeftMouseUp &&
[currentEvent type] != NSLeftMouseDown);
}
NS_HANDLER
{
}
NS_ENDHANDLER
[NSCursor pop];
[self _releaseMouse: self];
}
- (void) _updatePicker: (id) sender