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

Merge branch 'master' into windows_corrections

Browse source
This commit is contained in:
Gregory John Casamento 2020-09-11 18:59:52 -04:00
commit 2f0a22357c
4 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2020-09-11 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSLayoutManager.m
(-glyphRangeForCharacterRange:actualCharacterRange:): Handle zero
length charRagne at end of text correctly.
2020-09-07 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSXib5KeyedUnarchiver.m
(-decodeCellPrototypeForElement:): Fix misuse of setType:.
2020-07-28 Gregory John Casamento <greg.casamento@gmail.com>
* Headers/AppKit/AppKit.h: Add all new headers

4
Source/GSLayoutManager.m
View file

@ -1134,16 +1134,16 @@ Fills in all glyph holes up to last. only looking at levels below level
*actualCharRange = charRange;
return NSMakeRange(0, 0);
}
target = charRange.location;
pos = NSMaxRange(charRange) - 1;
[self _generateGlyphsUpToCharacter: pos];
if (glyphs->char_length <= pos)
if (glyphs->char_length <= pos || glyphs->char_length <= target)
{
if (actualCharRange)
*actualCharRange = NSMakeRange([[_textStorage string] length], 0);
return NSMakeRange([self numberOfGlyphs], 0);
}
target = charRange.location;
r = [self _glyphForCharacter: target
index: &i
positions: &pos : &cpos];

2
Source/GSXib5KeyedUnarchiver.m
View file

@ -2138,7 +2138,7 @@ didStartElement: (NSString*)elementName
{
id object = [[NSBrowserCell alloc] initTextCell: @"BrowserItem"];
[object setType: NSPushInCell];
[object setCellAttribute: NSPushInCell to: YES];
[object setWraps: NO];
[object sendActionOn: NSLeftMouseUpMask];
[object setEnabled: YES];

25
Source/NSWindow.m
View file

@ -1757,21 +1757,22 @@ titleWithRepresentedFilename(NSString *representedFilename)
- (void) makeKeyAndOrderFront: (id)sender
{
[self deminiaturize: self];
/*
* If a window is ordered in, make sure that the application isn't hidden,
* and is active.
*/
if ([self canBecomeKeyWindow])
[self orderFrontRegardless];
if ([self canBecomeKeyWindow] != NO)
{
[self makeKeyWindow];
/*
* OPENSTEP makes a window the main window when it makes it the key window.
* So we do the same (though the documentation doesn't mention it).
*/
[self makeMainWindow];
/*
* If a window is ordered in, make sure that the application isn't hidden,
* and is active.
*/
[NSApp unhide: self];
}
[self orderFrontRegardless];
[self makeKeyWindow];
/*
* OPENSTEP makes a window the main window when it makes it the key window.
* So we do the same (though the documentation doesn't mention it).
*/
[self makeMainWindow];
}
- (void) makeKeyWindow