gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-02 12:41:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix tab selection on add/insert/remove

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@35564 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2012-09-12 00:36:49 +00:00
parent a0564c8ee4
commit ed7a880a0c
2 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Headers/AppKit/NSTabView.h
View file

@ -54,7 +54,6 @@ typedef enum {
BOOL _draws_background; BOOL _draws_background;
BOOL _truncated_label; BOOL _truncated_label;
id _delegate; id _delegate;
NSUInteger _selected_item;
} }
- (void)addTabViewItem:(NSTabViewItem *)tabViewItem; - (void)addTabViewItem:(NSTabViewItem *)tabViewItem;
- (void)insertTabViewItem:(NSTabViewItem *)tabViewItem - (void)insertTabViewItem:(NSTabViewItem *)tabViewItem

147
Source/NSTabView.m
View file

@ -43,6 +43,7 @@
#import "GNUstepGUI/GSTheme.h" #import "GNUstepGUI/GSTheme.h"
#import "GSBindingHelpers.h" #import "GSBindingHelpers.h"
@implementation NSTabView @implementation NSTabView
/* /*
@ -70,8 +71,7 @@
// setup variables // setup variables
ASSIGN(_items, [NSMutableArray array]); ASSIGN(_items, [NSMutableArray array]);
ASSIGN(_font, [NSFont systemFontOfSize: 0]); ASSIGN(_font, [NSFont systemFontOfSize: 0]);
_selected_item = NSNotFound; _selected = nil;
//_selected = nil;
//_truncated_label = NO; //_truncated_label = NO;
} }
@ -103,15 +103,17 @@
- (void) insertTabViewItem: (NSTabViewItem*)tabViewItem - (void) insertTabViewItem: (NSTabViewItem*)tabViewItem
atIndex: (NSInteger)index atIndex: (NSInteger)index
{ {
if (tabViewItem == nil)
return;
[tabViewItem _setTabView: self]; [tabViewItem _setTabView: self];
[_items insertObject: tabViewItem atIndex: index]; [_items insertObject: tabViewItem atIndex: index];
// If this is the first inserted then select it...
if ([_items count] == 1)
[self selectTabViewItem: tabViewItem];
if ((_selected_item != NSNotFound) && (index <= _selected_item)) if ([_delegate respondsToSelector:
{
_selected_item++;
}
if ([_delegate respondsToSelector:
@selector(tabViewDidChangeNumberOfTabViewItems:)]) @selector(tabViewDidChangeNumberOfTabViewItems:)])
{ {
[_delegate tabViewDidChangeNumberOfTabViewItems: self]; [_delegate tabViewDidChangeNumberOfTabViewItems: self];
@ -123,35 +125,33 @@
- (void) removeTabViewItem: (NSTabViewItem*)tabViewItem - (void) removeTabViewItem: (NSTabViewItem*)tabViewItem
{ {
NSUInteger i = [_items indexOfObject: tabViewItem]; NSUInteger i = [self indexOfTabViewItem: tabViewItem];
if (i == NSNotFound) if (i == NSNotFound)
return; return;
if ([tabViewItem isEqual: _selected]) // Do this BEFORE removing from array...in case it gets released...
{ [tabViewItem _setTabView:nil];
// We cannot call [self selectTabViewItem: nil] here as the delegate might refuse this
[[_selected view] removeFromSuperview];
_selected = nil;
_selected_item = NSNotFound;
}
[_items removeObjectAtIndex: i]; [_items removeObjectAtIndex: i];
if ((_selected_item != NSNotFound) && (i <= _selected_item)) if (tabViewItem == _selected)
{ {
_selected_item--; if ([_items count] == 0)
{
[self selectTabViewItem: nil];
}
else
{
// Select a new tab index...
NSUInteger newIndex = ((i < [_items count]) ? i : (i-1));
[self selectTabViewItem: [_items objectAtIndex: newIndex]];
}
} }
if ([_delegate respondsToSelector: if ([_delegate respondsToSelector: @selector(tabViewDidChangeNumberOfTabViewItems:)])
@selector(tabViewDidChangeNumberOfTabViewItems:)])
{ {
[_delegate tabViewDidChangeNumberOfTabViewItems: self]; [_delegate tabViewDidChangeNumberOfTabViewItems: self];
} }
/* TODO (Optimize) - just mark the tabs rect as needing redisplay unless
removed tab was selected */
[self setNeedsDisplay: YES];
} }
- (NSInteger) indexOfTabViewItem: (NSTabViewItem*)tabViewItem - (NSInteger) indexOfTabViewItem: (NSTabViewItem*)tabViewItem
@ -202,43 +202,43 @@
- (void) selectNextTabViewItem: (id)sender - (void) selectNextTabViewItem: (id)sender
{ {
if ((_selected_item != NSNotFound) && ((_selected_item + 1) < [_items count])) NSUInteger selected_item = [self indexOfTabViewItem:_selected];
if (selected_item != NSNotFound)
{ {
[self selectTabViewItemAtIndex: _selected_item + 1]; [self selectTabViewItemAtIndex: selected_item + 1];
} }
} }
- (void) selectPreviousTabViewItem: (id)sender - (void) selectPreviousTabViewItem: (id)sender
{ {
if ((_selected_item != NSNotFound) && (_selected_item > 0)) NSUInteger selected_item = [self indexOfTabViewItem:_selected];
if (selected_item != NSNotFound)
{ {
[self selectTabViewItemAtIndex: _selected_item - 1]; [self selectTabViewItemAtIndex: selected_item - 1];
} }
} }
- (NSTabViewItem*) selectedTabViewItem - (NSTabViewItem*) selectedTabViewItem
{ {
// FIXME: Why not just return _selected? return _selected;
if (_selected_item == NSNotFound || [_items count] == 0)
return nil;
return [_items objectAtIndex: _selected_item];
} }
- (void) selectTabViewItem: (NSTabViewItem*)tabViewItem - (void) selectTabViewItem: (NSTabViewItem*)tabViewItem
{ {
BOOL canSelect = YES; BOOL canSelect = YES;
if ([_delegate respondsToSelector: if ([_delegate respondsToSelector: @selector(tabView: shouldSelectTabViewItem:)])
@selector(tabView: shouldSelectTabViewItem:)])
{ {
canSelect = [_delegate tabView: self canSelect = [_delegate tabView: self shouldSelectTabViewItem: tabViewItem];
shouldSelectTabViewItem: tabViewItem];
} }
if (canSelect) if (canSelect)
{ {
NSView *selectedView; if ([_delegate respondsToSelector: @selector(tabView: willSelectTabViewItem:)])
{
[_delegate tabView: self willSelectTabViewItem: tabViewItem];
}
if (_selected != nil) if (_selected != nil)
{ {
[_selected _setTabState: NSBackgroundTab]; [_selected _setTabState: NSBackgroundTab];
@ -246,34 +246,34 @@
/* NB: If [_selected view] is nil this does nothing, which /* NB: If [_selected view] is nil this does nothing, which
is fine. */ is fine. */
[[_selected view] removeFromSuperview]; [[_selected view] removeFromSuperview];
_selected = nil;
} }
if ([_delegate respondsToSelector: if (tabViewItem)
@selector(tabView: willSelectTabViewItem:)])
{ {
[_delegate tabView: self willSelectTabViewItem: tabViewItem]; _selected = tabViewItem;
} [_selected _setTabState: NSSelectedTab];
_selected = tabViewItem; NSView *selectedView = [_selected view];
_selected_item = [_items indexOfObject: _selected];
[_selected _setTabState: NSSelectedTab];
selectedView = [_selected view]; if (selectedView == nil)
{
if (selectedView != nil) NSLog(@"%s:selected view is NIL\n", __PRETTY_FUNCTION__);
{ }
[self addSubview: selectedView]; else
// FIXME: We should not change this mask {
[selectedView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable]; [self addSubview: selectedView];
[selectedView setFrame: [self contentRect]]; // FIXME: We should not change this mask
[_window makeFirstResponder: [_selected initialFirstResponder]]; [selectedView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[selectedView setFrame: [self contentRect]];
[_window makeFirstResponder: [_selected initialFirstResponder]];
}
} }
/* Will need to redraw tabs and content area. */ /* Will need to redraw tabs and content area. */
[self setNeedsDisplay: YES]; [self setNeedsDisplay: YES];
if ([_delegate respondsToSelector: if ([_delegate respondsToSelector: @selector(tabView: didSelectTabViewItem:)])
@selector(tabView: didSelectTabViewItem:)])
{ {
[_delegate tabView: self didSelectTabViewItem: _selected]; [_delegate tabView: self didSelectTabViewItem: _selected];
} }
@ -486,12 +486,10 @@
if (anItem != nil && ![anItem isEqual: _selected]) if (anItem != nil && ![anItem isEqual: _selected])
{ {
GSKeyValueBinding *theBinding;
[self selectTabViewItem: anItem]; [self selectTabViewItem: anItem];
theBinding = [GSKeyValueBinding getBinding: NSSelectedIndexBinding GSKeyValueBinding *theBinding = [GSKeyValueBinding getBinding: NSSelectedIndexBinding
forObject: self]; forObject: self];
if (theBinding != nil) if (theBinding != nil)
[theBinding reverseSetValueFor: NSSelectedIndexBinding]; [theBinding reverseSetValueFor: NSSelectedIndexBinding];
} }
@ -544,13 +542,14 @@
} }
else else
{ {
NSUInteger selected_item = [self indexOfTabViewItem:_selected];
[aCoder encodeObject: _items]; [aCoder encodeObject: _items];
[aCoder encodeObject: _font]; [aCoder encodeObject: _font];
[aCoder encodeValueOfObjCType: @encode(int) at: &_type]; [aCoder encodeValueOfObjCType: @encode(int) at: &_type];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_draws_background]; [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_draws_background];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_truncated_label]; [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_truncated_label];
[aCoder encodeConditionalObject: _delegate]; [aCoder encodeConditionalObject: _delegate];
[aCoder encodeValueOfObjCType: @encode(NSUInteger) at: &_selected_item]; [aCoder encodeValueOfObjCType: @encode(NSUInteger) at: &selected_item];
} }
} }
@ -558,8 +557,6 @@
{ {
self = [super initWithCoder: aDecoder]; self = [super initWithCoder: aDecoder];
_selected_item = NSNotFound;
if ([aDecoder allowsKeyedCoding]) if ([aDecoder allowsKeyedCoding])
{ {
if ([aDecoder containsValueForKey: @"NSAllowTruncatedLabels"]) if ([aDecoder containsValueForKey: @"NSAllowTruncatedLabels"])
@ -633,17 +630,21 @@
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_draws_background]; [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_draws_background];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_truncated_label]; [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_truncated_label];
_delegate = [aDecoder decodeObject]; _delegate = [aDecoder decodeObject];
NSUInteger selected_item = NSNotFound;
if (version < 3) if (version < 3)
{ {
int tmp; int tmp;
[aDecoder decodeValueOfObjCType: @encode(int) at: &tmp]; [aDecoder decodeValueOfObjCType: @encode(int) at: &tmp];
_selected_item = tmp; selected_item = tmp;
} }
else else
{ {
[aDecoder decodeValueOfObjCType: @encode(NSUInteger) at: &_selected_item]; [aDecoder decodeValueOfObjCType: @encode(NSUInteger) at: &selected_item];
} }
_selected = [_items objectAtIndex: _selected_item];
if (selected_item != NSNotFound)
_selected = [_items objectAtIndex: selected_item];
} }
return self; return self;
} }