mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 12:00:52 +00:00
Undo last hack and add a slightly better on.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26250 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
b76f1b348c
commit
8576fa60d7
2 changed files with 10 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
2008-03-08 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSToolbarItem.m (-_setSelected:):
|
||||
Undo last hack and add a slightly better on.
|
||||
|
||||
2008-03-08 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Source/NSToolbarItem.m (GSToolbarButton-sendAction:to:):
|
||||
|
|
|
@ -358,9 +358,6 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovableToolbarItemPboardType";
|
|||
|
||||
- (BOOL) sendAction: (SEL)action to: (id)target
|
||||
{
|
||||
if (!action)
|
||||
return NO;
|
||||
|
||||
if ([_toolbarItem _selectable])
|
||||
{
|
||||
[[_toolbarItem toolbar]
|
||||
|
@ -418,7 +415,7 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovableToolbarItemPboardType";
|
|||
}
|
||||
}
|
||||
|
||||
// Overriden NSButtonCell method to make sure all test is at the same height.
|
||||
// Overriden NSButtonCell method to make sure all text is at the same height.
|
||||
- (void) drawInteriorWithFrame: (NSRect)cellFrame inView: (NSView*)controlView
|
||||
{
|
||||
BOOL flippedView = [controlView isFlipped];
|
||||
|
@ -1471,7 +1468,10 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovableToolbarItemPboardType";
|
|||
{
|
||||
if (_selectable && [self _selected] == NO && selected)
|
||||
{
|
||||
[(GSToolbarButton *)_backView performClick:self];
|
||||
// FIXME: This is a hack to break a recursion.
|
||||
// I think the code here is at fault. FK
|
||||
//[(GSToolbarButton *)_backView performClick:self];
|
||||
[(GSToolbarButton *)_backView setState: YES];
|
||||
}
|
||||
else if (selected == NO)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue