mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-04 22:40:50 +00:00
* Source/NSView.m (-setHidden:): Fix un-hiding of hidden views, loaded
from nib's, with subviews. The subview coordinates just need to be invalidated when the view is unhidden. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29416 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
48a4ef2ece
commit
384f64e87e
3 changed files with 24 additions and 0 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2010-01-26 Eric Wasylishen <ewasylishen@gmail.com>
|
||||||
|
|
||||||
|
* Source/NSView.m (-setHidden:): Fix un-hiding of hidden views, loaded
|
||||||
|
from nib's, with subviews. The subview coordinates just need to be
|
||||||
|
invalidated when the view is unhidden.
|
||||||
|
|
||||||
2010-01-24 03:07-EST Gregory John Casamento <greg.casamento@gmail.com>
|
2010-01-24 03:07-EST Gregory John Casamento <greg.casamento@gmail.com>
|
||||||
|
|
||||||
* Source/NSWindow.m: Uncomment updateMenu:.. method call in
|
* Source/NSWindow.m: Uncomment updateMenu:.. method call in
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
#import "GSThemePrivate.h"
|
#import "GSThemePrivate.h"
|
||||||
|
|
||||||
|
#import "AppKit/NSApplication.h"
|
||||||
#import "AppKit/NSAttributedString.h"
|
#import "AppKit/NSAttributedString.h"
|
||||||
#import "AppKit/NSBezierPath.h"
|
#import "AppKit/NSBezierPath.h"
|
||||||
#import "AppKit/NSButtonCell.h"
|
#import "AppKit/NSButtonCell.h"
|
||||||
|
@ -210,6 +211,11 @@
|
||||||
NSColor *c;
|
NSColor *c;
|
||||||
|
|
||||||
c = [[view window] backgroundColor];
|
c = [[view window] backgroundColor];
|
||||||
|
|
||||||
|
if ([[view window] isMainWindow] &&
|
||||||
|
[[NSApplication sharedApplication] isActive])
|
||||||
|
c = [NSColor whiteColor];
|
||||||
|
|
||||||
[c set];
|
[c set];
|
||||||
NSRectFill (frame);
|
NSRectFill (frame);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2801,6 +2801,18 @@ in the main thread.
|
||||||
[GSDisplayServer addDragTypes: t toWindow: _window];
|
[GSDisplayServer addDragTypes: t toWindow: _window];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (_rFlags.has_subviews)
|
||||||
|
{
|
||||||
|
// The _visibleRect of subviews will be NSZeroRect, because when they
|
||||||
|
// were calculated in -[_rebuildCoordinates], they were intersected
|
||||||
|
// with the result of calling -[visibleRect] on the hidden superview,
|
||||||
|
// which returns NSZeroRect for hidden views.
|
||||||
|
//
|
||||||
|
// So, recalculate the subview coordinates now to make them correct.
|
||||||
|
|
||||||
|
[_sub_views makeObjectsPerformSelector:
|
||||||
|
@selector(_invalidateCoordinates)];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
[self setNeedsDisplay: YES];
|
[self setNeedsDisplay: YES];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue