Author: fredkiefer Date: Mon Nov 21 21:54:13 2016 New Revision: 40228 URL: http://svn.gna.org/viewcvs/gnustep?rev=40228&view=rev Log: * Source/NSColorPanel.m (-_initWithoutGModel): Correct target for bottom wells. * Source/NSColorWell.m (-performClick:): Add this method and use it in -mouseUp:. Patch by Josh Freeman <pikopi...@twilightedge.com>.
Modified: libs/gui/trunk/ChangeLog libs/gui/trunk/Source/NSColorPanel.m libs/gui/trunk/Source/NSColorWell.m Modified: libs/gui/trunk/ChangeLog URL: http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=40228&r1=40227&r2=40228&view=diff ============================================================================== --- libs/gui/trunk/ChangeLog (original) +++ libs/gui/trunk/ChangeLog Mon Nov 21 21:54:13 2016 @@ -1,3 +1,11 @@ +2016-11-21 Fred Kiefer <fredkie...@gmx.de> + + * Source/NSColorPanel.m (-_initWithoutGModel): Correct target for + bottom wells. + * Source/NSColorWell.m (-performClick:): Add this method and use + it in -mouseUp:. + Patch by Josh Freeman <pikopi...@twilightedge.com>. + 2016-10-29 Fred Kiefer <fredkie...@gmx.de> * Source/NSBitmapImageRep.m: Set the TIFF subfield type to 0 Modified: libs/gui/trunk/Source/NSColorPanel.m URL: http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSColorPanel.m?rev=40228&r1=40227&r2=40228&view=diff ============================================================================== --- libs/gui/trunk/Source/NSColorPanel.m (original) +++ libs/gui/trunk/Source/NSColorPanel.m Mon Nov 21 21:54:13 2016 @@ -350,7 +350,7 @@ [well setColor: colour]; [well setBordered: NO]; [well setEnabled: YES]; - [well setTarget: _colorWell]; + [well setTarget: self]; [well setAction: @selector(_bottomWellAction:)]; [swatchView addSubview: well]; RELEASE(well); Modified: libs/gui/trunk/Source/NSColorWell.m URL: http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSColorWell.m?rev=40228&r1=40227&r2=40228&view=diff ============================================================================== --- libs/gui/trunk/Source/NSColorWell.m (original) +++ libs/gui/trunk/Source/NSColorWell.m Mon Nov 21 21:54:13 2016 @@ -366,20 +366,25 @@ if (inside) { - if (_is_active == NO) - { - [self activate: YES]; - } - else - { - [self deactivate]; - } + [self performClick: self]; } } - (id) objectValue { return [self color]; +} + +- (void) performClick: (id)sender +{ + if ([self isActive]) + { + [self deactivate]; + } + else + { + [self activate: YES]; + } } - (BOOL) performDragOperation: (id <NSDraggingInfo>)sender _______________________________________________ Gnustep-cvs mailing list Gnustep-cvs@gna.org https://mail.gna.org/listinfo/gnustep-cvs