gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 18:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clipview redisplay fix

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7854 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-10-20 04:19:22 +00:00
parent f2691db38d
commit c95e77dadb
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-10-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSClipView.m: ([-viewFrameChanged:]) fix test for when to
redraw entire area becaause document view is smaller than clipview.
Suggested by benhur@inf.UFSM.br
2000-10-19 Michael Hanni <mhanni@sprintmail.com> 2000-10-19 Michael Hanni <mhanni@sprintmail.com>
* Source/NSTabView.m: a few bugfixes. * Source/NSTabView.m: a few bugfixes.

15
Source/NSClipView.m
View file

@ -291,19 +291,14 @@
- (void) viewFrameChanged: (NSNotification*)aNotification - (void) viewFrameChanged: (NSNotification*)aNotification
{ {
NSRect documentFrame = [_documentView frame];
[self setBoundsOrigin: [self constrainScrollPoint: _bounds.origin]]; [self setBoundsOrigin: [self constrainScrollPoint: _bounds.origin]];
/* If _bounds completely encloses (touching allowed) documentFrame */ /* If document frame does not completely cover _bounds */
if ((_bounds.origin.x <= documentFrame.origin.x) if (NSContainsRect([_documentView frame], _bounds) == NO)
&& (_bounds.origin.y <= documentFrame.origin.y)
&& (_bounds.origin.x + _bounds.size.width
>= documentFrame.origin.x + documentFrame.size.width)
&& (_bounds.origin.y + _bounds.size.height
>= documentFrame.origin.y + documentFrame.size.height))
{ {
/* then fill the area not covered by documentView with background color */ /*
* fill the area not covered by documentView with background color
*/
[self setNeedsDisplay: YES]; [self setNeedsDisplay: YES];
} }

19
Source/NSImage.m
View file

@ -176,15 +176,18 @@ static Class cacheClass = 0;
/* If there is no image with that name, search in the main bundle */ /* If there is no image with that name, search in the main bundle */
if (!nameDict || ![nameDict objectForKey: aName]) if (!nameDict || ![nameDict objectForKey: aName])
{ {
NSString* ext; NSString *ext;
NSString* path = nil; NSString *path = nil;
NSBundle* main_bundle; NSBundle *main_bundle;
NSArray *array; NSArray *array;
NSString *the_name = aName; NSString *the_name = aName;
main_bundle = [NSBundle mainBundle]; main_bundle = [NSBundle mainBundle];
ext = [aName pathExtension]; ext = [aName pathExtension];
if (ext && [ext length] == 0) if (ext != nil && [ext length] == 0)
ext = nil; {
ext = nil;
}
/* Check if extension is one of the image types */ /* Check if extension is one of the image types */
array = [self imageFileTypes]; array = [self imageFileTypes];