Nabble - GNUstep - Dev

[BitmapCoordinates.patch]
Index: Source/NSBitmapImageRep.m

===================================================================

--- Source/NSBitmapImageRep.m	(revision 29117)

+++ Source/NSBitmapImageRep.m	(working copy)

@@ -756,6 +756,10 @@

   return value & ((1<<bit_width)-1);

 }

 

+/**

+ * Returns the values of the components of pixel (x,y), where (0,0) is the 

+ * top-left pixel in the image, by storing them in the array pixelData.

+ */

 - (void) getPixel: (unsigned int[])pixelData atX: (int)x y: (int)y

 {

   int i;

@@ -768,9 +772,7 @@

       return;

     }

 

-  // FIXME: The y value is taken from the bottom of the image. 

-  // Not sure if this is correct.

-  line_offset = _bytesPerRow * (_pixelsHigh - 1 - y);

+  line_offset = _bytesPerRow * y;

   if (_isPlanar)

     {

       if (_bitsPerSample == 8)

@@ -847,6 +849,10 @@

   base[byte2] = (value & 255) | (base[byte2] ^ (all & 255));

 }

 

+/**

+ * Sets the components of pixel (x,y), where (0,0) is the top-left pixel in

+ * the image, to the given array of pixel components. 

+ */

 - (void) setPixel: (unsigned int[])pixelData atX: (int)x y: (int)y

 {

   int i;

@@ -865,9 +871,7 @@

       [self bitmapData];

     }

 

-  // FIXME: The y value is taken from the bottom of the image. 

-  // Not sure if this is correct.

-  line_offset = _bytesPerRow * (_pixelsHigh - 1 - y);

+  line_offset = _bytesPerRow * y;

   if(_isPlanar)

     {

       if (_bitsPerSample == 8)

@@ -911,6 +915,10 @@

     }

 }

 

+/**

+ * Returns an NSColor object representing the color of the pixel (x,y), where

+ * (0,0) is the top-left pixel in the image.

+ */

 - (NSColor*) colorAtX: (int)x y: (int)y

 {

 	unsigned int pixelData[5];

@@ -1159,6 +1167,10 @@

 	return nil;

 }

 

+/**

+ * Sets the color of pixel (x,y), where (0,0) is the top-left pixel in the

+ * image.

+ */

 - (void) setColor: (NSColor*)color atX: (int)x y: (int)y

 {

 	unsigned int pixelData[5];

Index: Source/GSThemeTools.m

===================================================================

--- Source/GSThemeTools.m	(revision 29117)

+++ Source/GSThemeTools.m	(working copy)

@@ -791,7 +791,7 @@

 

   for (i = 0; i < s.width; i++)

     {

-      NSColor	*pixelColor = [rep colorAtX: i y: s.height - 1];

+      NSColor	*pixelColor = [rep colorAtX: i y: 0];

 

       [pixelColor getRed: &r green: &g blue: &b alpha: &a];

       if (a > 0 && x1 == -1)

Index: ChangeLog

===================================================================

--- ChangeLog	(revision 29117)

+++ ChangeLog	(working copy)

@@ -1,3 +1,11 @@

+2009-12-12 Eric Wasylishen <ewasylishen@...>

+

+	* Source/NSBitmapImageRep.m:

+	* Source/GSThemeTools.m: 

+	Change the colorAtX:y: and related methods in NSBitmapImageRep

+	to use flipped coordinates, matching OS X. colorAtX:0 y:0 now 

+	returns the top-left pixel instead of the bottom left.

+

 2009-12-12 Fred Kiefer <FredKiefer@...>

 

 	* Source/NSApplication (-setWindowsMenu:): Only add windows that 


[ColorWell2.diff]
Index: Source/NSColorWell.m

===================================================================

--- Source/NSColorWell.m	(revision 29108)

+++ Source/NSColorWell.m	(working copy)

@@ -46,8 +46,6 @@

 static NSString *GSColorWellDidBecomeExclusiveNotification =

                     @"GSColorWellDidBecomeExclusiveNotification";

 

-static NSPoint _lastMouseDownPoint;

-

 @implementation NSColorWell

 

 /*

@@ -102,6 +100,7 @@

            object: nil];

 

   _is_active = YES;

+  [[self cell] setHighlighted: YES];

 

   [colorPanel setColor: _the_color];

   [colorPanel orderFront: self];

@@ -124,6 +123,7 @@

 - (void) deactivate

 {

   _is_active = NO;

+  [[self cell] setHighlighted: NO];

 

   [[NSNotificationCenter defaultCenter] removeObserver: self];

 

@@ -147,6 +147,10 @@

   NSDragOperation sourceDragMask;

        

   NSDebugLLog(@"NSColorWell", @"%@: draggingEntered", self);

+

+  if ([self isEnabled] == NO)

+    return NSDragOperationNone;

+ 

   sourceDragMask = [sender draggingSourceOperationMask];

   pb = [sender draggingPasteboard];

  

@@ -285,39 +289,89 @@

 

 - (void) mouseDown: (NSEvent *)theEvent

 {

+  BOOL done;

+  BOOL inside;

+  BOOL startedInWell;

+  NSPoint point;

+

   //

   // OPENSTEP 4.2 and OSX behavior indicates that the colorwell doesn't

   // work when the widget is marked as disabled.

   //

-  if ([self isEnabled])

+  if ([self isEnabled] == NO)

+    return;

+

+  //

+  // Unbordered color wells start a drag immediately upon mouse down

+  //

+  if ([self isBordered] == NO)

     {

-      _lastMouseDownPoint = 

-         [self convertPoint: [theEvent locationInWindow]

-                   fromView: nil];

+      [NSColorPanel dragColor: _the_color

+		    withEvent: theEvent

+		    fromView: self];

+      return;

+    }

 

-      if (_is_active == NO)

+  point = [self convertPoint: [theEvent locationInWindow]

+		    fromView: nil];

+  startedInWell = [self mouse: point inRect: _wellRect];

+

+  [[self cell] setHighlighted: ![self isActive]];

+  [self setNeedsDisplay: YES];

+

+  done = NO;

+  while (!done)

+    {

+      theEvent = [[self window] nextEventMatchingMask: 

+		NSLeftMouseUpMask | NSLeftMouseDraggedMask];

+      point = [self convertPoint: [theEvent locationInWindow]

+		        fromView: nil];

+      inside = [self mouse: point inRect: [self bounds]];

+

+      switch ([theEvent type])

 	{

-	  [self activate: YES];

+	case NSLeftMouseDragged:

+	  if (startedInWell)

+	    {

+	      [[self cell] setHighlighted: [self isActive]];

+	      [self setNeedsDisplay: YES];

+

+	      [NSColorPanel dragColor: _the_color

+			    withEvent: theEvent

+			     fromView: self];

+	      done = YES;

+	    } 

+	  else 

+	    {

+	      [[self cell] setHighlighted: inside ^ [self isActive]];

+	      [self setNeedsDisplay: YES];

+	    }

+	  break;

+	case NSLeftMouseUp:

+	  if (inside)

+	    {

+	      if (_is_active == NO)

+		{

+		  [self activate: YES];

+		}

+	      else

+		{

+		  [self deactivate];

+		}

+	    } 

+	  else 

+	    {

+	      [[self cell] setHighlighted: [self isActive]];

+	      [self setNeedsDisplay: YES];

+	    }

+	  done = YES;

+	  break;

+	default:

+	  break;

 	}

-      else

-	{

-	  [self deactivate];

-	}

     }

 }

 

-- (void) mouseDragged: (NSEvent *)theEvent

-{

-  if ([self isEnabled])

-    {

-      if ([self mouse: _lastMouseDownPoint inRect: _wellRect])

-        {

-          [NSColorPanel dragColor: _the_color

-			withEvent: theEvent

-			fromView: self];

-        }

-    }

-}

 

 - (BOOL) performDragOperation: (id <NSDraggingInfo>)sender

 {

Index: Source/GSThemeDrawing.m

===================================================================

--- Source/GSThemeDrawing.m	(revision 29108)

+++ Source/GSThemeDrawing.m	(working copy)

@@ -728,7 +728,7 @@

       /*

        * Fill in control color.

        */

-      if ([well isActive])

+      if ([[well cell] isHighlighted])

 	{

 	  [[NSColor selectedControlColor] set];

 	}

Index: Source/NSColorPanel.m

===================================================================

--- Source/NSColorPanel.m	(revision 29108)

+++ Source/NSColorPanel.m	(working copy)

@@ -356,7 +356,7 @@

 

 - (void) _updatePicker: (id) sender

 {

-  [_currentPicker setColor: [_colorWell color]];

+  [self setColor: [_colorWell color]];

 }

 

 - (void) _bottomWellAction: (id) sender


[ColorWell.diff]
Index: Source/NSColorWell.m

===================================================================

--- Source/NSColorWell.m	(revision 29096)

+++ Source/NSColorWell.m	(working copy)

@@ -46,6 +46,8 @@

 static NSString *GSColorWellDidBecomeExclusiveNotification =

                     @"GSColorWellDidBecomeExclusiveNotification";

 

+static NSPoint _lastMouseDownPoint;

+

 @implementation NSColorWell

 

 /*

@@ -289,17 +291,12 @@

   //

   if ([self isEnabled])

     {

-      NSPoint point = [self convertPoint: [theEvent locationInWindow]

-                            fromView: nil];

+      _lastMouseDownPoint = 

+         [self convertPoint: [theEvent locationInWindow]

+                   fromView: nil];

 

-      if ([self mouse: point inRect: _wellRect])

+      if (_is_active == NO)

 	{

-	  [NSColorPanel dragColor: _the_color

-			withEvent: theEvent

-			fromView: self];

-	}

-      else if (_is_active == NO)

-	{

 	  [self activate: YES];

 	}

       else

@@ -309,6 +306,19 @@

     }

 }

 

+- (void) mouseDragged: (NSEvent *)theEvent

+{

+  if ([self isEnabled])

+    {

+      if ([self mouse: _lastMouseDownPoint inRect: _wellRect])

+        {

+          [NSColorPanel dragColor: _the_color

+			withEvent: theEvent

+			fromView: self];

+        }

+    }

+}

+

 - (BOOL) performDragOperation: (id <NSDraggingInfo>)sender

 {

   NSPasteboard *pb = [sender draggingPasteboard];



Nabble - GNUstep - Dev

Re: [PATCH] NSBitmapImageRep colorAtX:y: flipped coordinates

[PATCH] NSBitmapImageRep colorAtX:y: flipped coordinates

[PATCH] Tile-drawing fixes

Re: [Gnustep-cvs] r29106 - in /libs/gui/trunk: ChangeLog Source/NSColorWell.m

Re: [Gnustep-cvs] r29106 - in /libs/gui/trunk: ChangeLog Source/NSColorWell.m

Re: NSTableColumn Archiving

Re: [Gnustep-cvs] r29106 - in /libs/gui/trunk: ChangeLog Source/NSColorWell.m

Re: [Gnustep-cvs] r29106 - in /libs/gui/trunk: ChangeLog Source/NSColorWell.m

Re: NSTableColumn Archiving

Re: [Gnustep-cvs] r29106 - in /libs/gui/trunk: ChangeLog Source/NSColorWell.m

Re: ABI / ivars policy

Re: [Gnustep-cvs] r29082 - in /libs/gui/trunk: ChangeLog Headers/AppKit/NSOutlineView.h Source/NSOutlineView.m

NSTableColumn Archiving

ABI / ivars policy

Re: Segfault in pbxbuild

[PATCH] NSColorWell activation on click

Re: [flame] NEWS file is useless

anybody working on gnustep on snow leo?

Re: [Gnustep-cvs] r29082 - in /libs/gui/trunk: ChangeLog Headers/AppKit/NSOutlineView.h Source/NSOutlineView.m

Segfault in pbxbuild

Re: [Gnustep-cvs] r29082 - in /libs/gui/trunk: ChangeLog Headers/AppKit/NSOutlineView.h Source/NSOutlineView.m

Re: [Gnustep-cvs] r29082 - in /libs/gui/trunk: ChangeLog Headers/AppKit/NSOutlineView.h Source/NSOutlineView.m

Re: XML GNUstep defaults (was: [flame] NEWS file is useless)

Re: XML GNUstep defaults (was: [flame] NEWS file is useless)

Re: XML GNUstep defaults (was: [flame] NEWS file is useless)

Re: XML GNUstep defaults (was: [flame] NEWS file is useless)

Re: Notification centre and threads

Re: Notification centre and threads

Notification centre and threads

Re: XML GNUstep defaults (was: [flame] NEWS file is useless)

Re: [flame] NEWS file is useless

Re: XML GNUstep defaults (was: [flame] NEWS file is useless)

Re: [flame] NEWS file is useless

Re: [flame] NEWS file is useless

Re: [flame] NEWS file is useless