Re: NSMatrix keyboard stuff
Now this looks like a nice and simple patch. If this replaces all your
previous patches then just go ahead and apply it. Or should I or Greg do
it for you? I think it is fine to have this one in, even if Greg will be
doing his stable release any time now.
Greg, are you actually? I just cannot remember what the result of that
discussion was. Currently I am keeping back my bigger changes and
waiting for you to give a sign when commits are welcome again.
Cheers.
Fred
Matt Rice schrieb:
On 2007-01-10 09:17:49 -0800 Matt Rice [EMAIL PROTECTED] wrote:
On 2007-01-10 09:04:57 -0800 Matt Rice [EMAIL PROTECTED] wrote:
On 2007-01-10 07:59:16 -0800 Fred Kiefer [EMAIL PROTECTED] wrote:
HI Matt,
could you please explain this patch a bit? Only the last bit is about
selecting the right cell in NSTrackModeMatrix. Are the other change a
result of this?
It looks like you intent to prevent the setting of the cell state for
this mode. Is this correct?
Yes, you understand the patch correctly,
I've just noticed the difference between -keyCell and -selected*,
which seems to be what i need/the reason for my confusion.
this one is much cleaner :D
ok... so this one isn't going to be correct either.. because
_selectCellAtRow:column: sets the state..
alright sorry for the barrage of emails.
I hadn't noticed the above because _selectCell:atRow:column: sets it to
NSOnState.
and the button i tested it with was on, so it was set to On then to Off
by the setNextState.
_selectCell:atRow:column: isn't right because the selected cell can have
an NSOffState.
for track/highlight mode and NSOnState for list/radio...
hopefully this patch takes care of it :D
matrix-kbd3.diff
Index: NSMatrix.m
===
--- NSMatrix.m(revision 24334)
+++ NSMatrix.m(working copy)
@@ -1211,7 +1211,14 @@
_selectedColumn = column;
_selectedCells[row][column] = YES;
- [_selectedCell setState: NSOnState];
+ if (_mode == NSListModeMatrix || _mode == NSRadioModeMatrix)
+{
+ [_selectedCell setState: NSOnState];
+ }
+ else
+{
+ [_selectedCell setNextState];
+ }
if (_mode == NSListModeMatrix)
[aCell setHighlighted: YES];
@@ -3695,25 +3702,17 @@
[self _altModifier: character];
else
{
- NSCell *cell;
-
switch (_mode)
{
case NSTrackModeMatrix:
case NSHighlightModeMatrix:
- cell = _cells[_dottedRow][_dottedColumn];
-
- [cell setNextState];
- [self setNeedsDisplayInRect: [self cellFrameAtRow: _dottedRow
- column: _dottedColumn]];
+ case NSRadioModeMatrix:
+ [self selectCellAtRow:_dottedRow column: _dottedColumn];
break;
case NSListModeMatrix:
if (!(modifiers NSShiftKeyMask))
[self deselectAllCells];
-
- case NSRadioModeMatrix:
- [self selectCellAtRow: _dottedRow column: _dottedColumn];
break;
}
___
Gnustep-dev mailing list
Gnustep-dev@gnu.org
http://lists.gnu.org/mailman/listinfo/gnustep-dev
Re: NSMatrix keyboard stuff
On 13 Jan 2007, at 20:38, Gregory John Casamento wrote: Large commits will be open again after this weekend's release. I was planning to cut the release of both gui and gorm tomorrow. Richard, when were you planning on releasing base? I was planning on doing that today. I'm a bit confused about Fred's email in this thread yesterday though ... sounds like he's been holding off commits to gui trunk for some reason that I perhaps missed. Just to be clear, I've been planning on a bugfix release of base 1.13.1 ... which would be usable with all existing released code, but would not be usable with gui trunk. Are you making a new gui release from trunk incompatible with the current release rather than a stable/bugfix release? If so, you will need an unstable release of base to go with it. ___ Gnustep-dev mailing list Gnustep-dev@gnu.org http://lists.gnu.org/mailman/listinfo/gnustep-dev
Re: NSMatrix keyboard stuff
On 2007-01-10 07:59:16 -0800 Fred Kiefer [EMAIL PROTECTED] wrote: HI Matt, could you please explain this patch a bit? Only the last bit is about selecting the right cell in NSTrackModeMatrix. Are the other change a result of this? It looks like you intent to prevent the setting of the cell state for this mode. Is this correct? Yes, you understand the patch correctly, I've just noticed the difference between -keyCell and -selected*, which seems to be what i need/the reason for my confusion. this one is much cleaner :D matrix-kbd2.diff Index: NSMatrix.m === --- NSMatrix.m (revision 24334) +++ NSMatrix.m (working copy) @@ -3703,6 +3703,7 @@ case NSHighlightModeMatrix: cell = _cells[_dottedRow][_dottedColumn]; + [self selectCellAtRow:_dottedRow column: _dottedColumn]; [cell setNextState]; [self setNeedsDisplayInRect: [self cellFrameAtRow: _dottedRow column: _dottedColumn]]; ___ Gnustep-dev mailing list Gnustep-dev@gnu.org http://lists.gnu.org/mailman/listinfo/gnustep-dev
Re: NSMatrix keyboard stuff
On 2007-01-10 09:04:57 -0800 Matt Rice [EMAIL PROTECTED] wrote: On 2007-01-10 07:59:16 -0800 Fred Kiefer [EMAIL PROTECTED] wrote: HI Matt, could you please explain this patch a bit? Only the last bit is about selecting the right cell in NSTrackModeMatrix. Are the other change a result of this? It looks like you intent to prevent the setting of the cell state for this mode. Is this correct? Yes, you understand the patch correctly, I've just noticed the difference between -keyCell and -selected*, which seems to be what i need/the reason for my confusion. this one is much cleaner :D ok... so this one isn't going to be correct either.. because _selectCellAtRow:column: sets the state.. ___ Gnustep-dev mailing list Gnustep-dev@gnu.org http://lists.gnu.org/mailman/listinfo/gnustep-dev
Re: NSMatrix keyboard stuff
On 2007-01-10 09:17:49 -0800 Matt Rice [EMAIL PROTECTED] wrote:
On 2007-01-10 09:04:57 -0800 Matt Rice [EMAIL PROTECTED] wrote:
On 2007-01-10 07:59:16 -0800 Fred Kiefer [EMAIL PROTECTED] wrote:
HI Matt,
could you please explain this patch a bit? Only the last bit is
about
selecting the right cell in NSTrackModeMatrix. Are the other change
a
result of this?
It looks like you intent to prevent the setting of the cell state
for
this mode. Is this correct?
Yes, you understand the patch correctly,
I've just noticed the difference between -keyCell and -selected*,
which seems to be what i need/the reason for my confusion.
this one is much cleaner :D
ok... so this one isn't going to be correct either.. because
_selectCellAtRow:column: sets the state..
alright sorry for the barrage of emails.
I hadn't noticed the above because _selectCell:atRow:column: sets it
to NSOnState.
and the button i tested it with was on, so it was set to On then to
Off by the setNextState.
_selectCell:atRow:column: isn't right because the selected cell can
have an NSOffState.
for track/highlight mode and NSOnState for list/radio...
hopefully this patch takes care of it :D
matrix-kbd3.diff
Index: NSMatrix.m
===
--- NSMatrix.m (revision 24334)
+++ NSMatrix.m (working copy)
@@ -1211,7 +1211,14 @@
_selectedColumn = column;
_selectedCells[row][column] = YES;
- [_selectedCell setState: NSOnState];
+ if (_mode == NSListModeMatrix || _mode == NSRadioModeMatrix)
+{
+ [_selectedCell setState: NSOnState];
+ }
+ else
+{
+ [_selectedCell setNextState];
+ }
if (_mode == NSListModeMatrix)
[aCell setHighlighted: YES];
@@ -3695,25 +3702,17 @@
[self _altModifier: character];
else
{
- NSCell *cell;
-
switch (_mode)
{
case NSTrackModeMatrix:
case NSHighlightModeMatrix:
- cell = _cells[_dottedRow][_dottedColumn];
-
- [cell setNextState];
- [self setNeedsDisplayInRect: [self cellFrameAtRow: _dottedRow
-column: _dottedColumn]];
+ case NSRadioModeMatrix:
+ [self selectCellAtRow:_dottedRow column: _dottedColumn];
break;
case NSListModeMatrix:
if (!(modifiers NSShiftKeyMask))
[self deselectAllCells];
-
- case NSRadioModeMatrix:
- [self selectCellAtRow: _dottedRow column: _dottedColumn];
break;
}
___
Gnustep-dev mailing list
Gnustep-dev@gnu.org
http://lists.gnu.org/mailman/listinfo/gnustep-dev
