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

GUI updates

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4928 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 1999-09-21 15:42:14 +00:00
parent 98a649c60a
commit 7c09fe33ca
3 changed files with 32 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
1999-09-21 Adam Fedor <fedor@gnu.org>
* Source/NSBrowserCell.m (-drawInteriorWithFrame:inView:): Put
arrow at extreme right of cell (patch from Tim Bissell
<tim_bissell@yahoo.co.uk>).
* Source/NSButtonsCell.m (-performClick:) Remove (duplicate of
NSCell method).
Tue Sep 15 1999 Nicola Pero <n.pero@mi.flashnet.it> Tue Sep 15 1999 Nicola Pero <n.pero@mi.flashnet.it>
(NB. The above date reflects submission of the patch - sorry I didn't (NB. The above date reflects submission of the patch - sorry I didn't

51
Source/NSBrowserCell.m
View file

@ -277,46 +277,41 @@ static Class colorClass;
control_view = controlView; // remember last view cell was drawn in control_view = controlView; // remember last view cell was drawn in
[controlView lockFocus]; [controlView lockFocus];
if (cell_highlighted || cell_state) // temporary hack FAR FIX ME? if (cell_highlighted || cell_state) // temporary hack FAR FIX ME?
{ {
backColor = [colorClass selectedControlColor]; backColor = [colorClass selectedControlColor];
[backColor set]; [backColor set];
if (!_isLeaf) if (!_isLeaf)
{ {
image = _highlightBranchImage; image = _highlightBranchImage;
image_rect.size.height = cellFrame.size.height; }
image_rect.size.width = image_rect.size.height;
// Right justify
image_rect.origin.x += cellFrame.size.width - image_rect.size.width;
image_rect.origin.y
= MAX(NSMidY(image_rect) - ([image size].height/2.),0.);
}
else else
image_rect = NSZeroRect; image_rect = NSZeroRect;
} }
else else
{ {
backColor = [[controlView window] backgroundColor]; backColor = [[controlView window] backgroundColor];
[backColor set]; [backColor set];
if (!_isLeaf) if (!_isLeaf)
{ {
image = _branchImage; image = _branchImage;
image_rect.size.height = cellFrame.size.height; }
image_rect.size.width = image_rect.size.height;
// Right justify
image_rect.origin.x += cellFrame.size.width - image_rect.size.width;
image_rect.origin.y
= MAX(NSMidY(image_rect) - ([image size].height/2.),0.);
}
else else
image_rect = NSZeroRect; image_rect = NSZeroRect;
} }
image_rect.size = [image size];
// Right justify
image_rect.origin.x += cellFrame.size.width - image_rect.size.width - 1.0;
image_rect.origin.y += (cellFrame.size.height - image_rect.size.height) / 2.0;
//MAX(NSMidY(image_rect) - ([image size].height/2.),0.);
NSRectFill(cellFrame); // Clear the background NSRectFill(cellFrame); // Clear the background
title_rect.size.width -= image_rect.size.width + 4; // draw the title cell title_rect.size.width -= image_rect.size.width + 4; // draw the title cell
[_browserText drawWithFrame: title_rect inView: controlView]; [_browserText drawWithFrame: title_rect inView: controlView];
if (image) if (image)
{ {
NSPoint position = image_rect.origin; NSPoint position = image_rect.origin;
[image setBackgroundColor: backColor]; [image setBackgroundColor: backColor];
@ -343,13 +338,13 @@ static Class colorClass;
NSPoint location = [controlView convertPoint: [theEvent locationInWindow] NSPoint location = [controlView convertPoint: [theEvent locationInWindow]
fromView: nil]; fromView: nil];
fprintf(stderr, " NSBrowserCell: editWithFrame --- "); NSDebugLog(@" NSBrowserCell: editWithFrame --- ");
[_browserText _setCursorLocation: location]; [_browserText _setCursorLocation: location];
[_browserText _setCursorVisibility: YES]; [_browserText _setCursorVisibility: YES];
if ([[controlView window] makeFirstResponder: controlView]) if ([[controlView window] makeFirstResponder: controlView])
fprintf(stderr, " XRBrowserCell: we are now first responder --- "); NSDebugLog(@" NSBrowserCell: we are now first responder --- ");
[self drawInteriorWithFrame: aRect inView: controlView]; [self drawInteriorWithFrame: aRect inView: controlView];
} }
@ -361,7 +356,7 @@ fprintf(stderr, " NSBrowserCell: editWithFrame --- ");
- (void) _handleKeyEvent: (NSEvent*)keyEvent - (void) _handleKeyEvent: (NSEvent*)keyEvent
{ {
fprintf(stderr, " NSBrowserCell: _handleKeyEvent --- "); NSDebugLog(@" NSBrowserCell: _handleKeyEvent --- ");
[_browserText _handleKeyEvent: keyEvent]; [_browserText _handleKeyEvent: keyEvent];

26
Source/NSButtonCell.m
View file

@ -183,32 +183,6 @@
[self setContinuous: YES]; [self setContinuous: YES];
} }
- (void) performClick: (id)sender
{
NSView *cv;
if (control_view)
cv = control_view;
else
cv = [NSView focusView];
[self highlight: YES withFrame: [cv frame] inView: cv];
if (action)
{
NS_DURING
{
[(NSControl*)cv sendAction: action to: target];
}
NS_HANDLER
{
[self highlight: NO withFrame: [cv frame] inView: cv];
[localException raise];
}
NS_ENDHANDLER
}
[self highlight: NO withFrame: [cv frame] inView: cv];
}
// //
// Setting the Key Equivalent // Setting the Key Equivalent
// //