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

Update changelog

Browse source
This commit is contained in:
Gregory John Casamento 2022-04-08 13:23:52 -04:00
commit 49b46c1c91
9 changed files with 167 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ChangeLog
View file

@ -18,6 +18,39 @@
* Tools/video/VideoOutputSink.m: Implementation of
playBytes:length: for playing the bytes as a movie.
2022-03-31 Riccardo Mottola <rm@gnu.org>
* Headers/Additions/GNUstepGUI/GSTheme.h
* Source/GSStandardWindowDecorationView.m
* Source/GSThemeDrawing.m
Refactor resize bar notch width to be a constant and private inside
GSTheme, making it accessible through -[GSTheme resizebarNotchWidth].
2022-03-31 Riccardo Mottola <rm@gnu.org>
* Source/GSStandardWindowDecorationView.m:
Fix resizing mode by fixing initialization order.
2022-03-29 Gregory John Casamento <greg.casamento@gmail.com>
* Headers/Additions/GNUstepGUI/GSXibKeyedUnarchiver.h
* Source/GSXib5KeyedUnarchiver.h
* Source/GSXib5KeyedUnarchiver.m
* Source/GSXibKeyedUnarchiver.m: Change format of
customClass dictionary.
2022-03-26 Gregory John Casamento <greg.casamento@gmail.com>
* Headers/Additions/GNUstepGUI/GSXibKeyedUnarchiver.h: Add
customClasses method and _customClasses ivar.
* Source/GSXib5KeyedUnarchiver.h: Remove _customClasses from
declarations here and the method as well.
* Source/GSXib5KeyedUnarchiver.m: Remove customClasses method
from here.
* Source/GSXibKeyedUnarchiver.m: Implement logic here to build
_customClasses array when loading a XIB of version 3 or 4.
>>>>>>> e0012349f6df6895f736de1f158c52116fce7fc1
2022-03-22 Riccardo Mottola <rm@gnu.org>
* Source/NSImageCell.m: subclass initImageCell, so that

2
Headers/Additions/GNUstepGUI/GSTheme.h
View file

@ -1227,6 +1227,8 @@ APPKIT_EXPORT NSString *GSThemeWillDeactivateNotification;
- (float) resizebarHeight;
- (float) resizebarNotchWidth;
- (float) titlebarButtonSize;
- (float) titlebarPaddingRight;

13
Headers/Additions/GNUstepGUI/GSXibKeyedUnarchiver.h
View file

@ -41,18 +41,31 @@
NSMutableArray *stack;
GSXibElement *currentElement;
NSMutableDictionary *decoded;
NSMutableDictionary *_customClasses;
}
+ (BOOL) checkXib5: (NSData *)data;
+ (NSKeyedUnarchiver *) unarchiverForReadingWithData: (NSData *)data;
- (void) _initCommon;
- (id) decodeObjectForXib: (GSXibElement*)element
forClassName: (NSString*)classname
withID: (NSString*)objID;
- (id) _decodeArrayOfObjectsForElement: (GSXibElement*)element;
- (id) _decodeDictionaryOfObjectsForElement: (GSXibElement*)element;
- (id) objectForXib: (GSXibElement*)element;
- (void) createCustomClassRecordForId: (NSString *)theId
withParentClass: (NSString *)parentClassName
forCustomClass: (NSString *)customClassName;
- (NSDictionary *) customClasses;
- (NSDictionary *) decoded;
@end

4
Headers/AppKit/NSFontAssetRequest.h
View file

@ -29,6 +29,8 @@
#import <Foundation/NSProgress.h>
#import <Foundation/NSError.h>
DEFINE_BLOCK_TYPE(GSFontAssetCompletionHandler, BOOL, NSError*);
#if OS_API_VERSION(MAC_OS_X_VERSION_10_13, GS_API_LATEST)
#if defined(__cplusplus)
@ -40,8 +42,6 @@ enum {
};
typedef NSUInteger NSFontAssetRequestOptions;
DEFINE_BLOCK_TYPE(GSFontAssetCompletionHandler, BOOL, NSError*);
@interface NSFontAssetRequest : NSObject <NSProgressReporting>
- (instancetype) initWithFontDescriptors: (NSArray *)fontDescriptors

13
Source/GSStandardWindowDecorationView.m
View file

@ -319,15 +319,13 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint,
NSEvent *currentEvent = event;
NSDate *distantPast = [NSDate distantPast];
NSDate *distantFuture = [NSDate distantFuture];
NSPoint firstPoint, point;
NSPoint firstPoint = [event locationInWindow];
NSPoint point;
NSRect newFrame, frame;
NSSize minSize, maxSize;
int num = 0;
GSResizeEdgeMode mode = [self resizeModeForPoint: firstPoint];
firstPoint = [event locationInWindow];
frame = [window frame];
minSize = [window minSize];
maxSize = [window maxSize];
@ -392,13 +390,14 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint,
- (GSResizeEdgeMode) resizeModeForPoint:(NSPoint)point
{
GSResizeEdgeMode mode;
float resizebarNotchWidth = [[GSTheme theme] resizebarNotchWidth];
if (resizeBarRect.size.width < 30 * 2
if (resizeBarRect.size.width < resizebarNotchWidth * 2
&& point.x < resizeBarRect.size.width / 2)
mode = GSResizeEdgeBottomLeftMode;
else if (point.x > resizeBarRect.size.width - 29)
else if (point.x > resizeBarRect.size.width - resizebarNotchWidth - 1)
mode = GSResizeEdgeBottomRightMode;
else if (point.x < 29)
else if (point.x < resizebarNotchWidth - 1)
mode = GSResizeEdgeBottomLeftMode;
else
mode = GSResizeEdgeBottomMode;

26
Source/GSThemeDrawing.m
View file

@ -1718,6 +1718,7 @@ static NSImage *spinningImages[MaxCount];
/* These include the black border. */
#define TITLE_HEIGHT 23.0
#define RESIZE_HEIGHT 9.0
#define RESIZE_NOTCH_WIDTH 30.0
#define TITLEBAR_BUTTON_SIZE 15.0
#define TITLEBAR_PADDING_TOP 4.0
#define TITLEBAR_PADDING_RIGHT 4.0
@ -1733,6 +1734,11 @@ static NSImage *spinningImages[MaxCount];
return RESIZE_HEIGHT;
}
- (float) resizebarNotchWidth
{
return RESIZE_NOTCH_WIDTH;
}
- (float) titlebarButtonSize
{
return TITLEBAR_BUTTON_SIZE;
@ -1910,6 +1916,8 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
- (void) drawResizeBarRect: (NSRect)resizeBarRect
{
GSDrawTiles *tiles;
float resizebarNotchWidth = [self resizebarNotchWidth];
tiles = [self tilesNamed: @"GSWindowResizeBar" state: GSThemeNormalState];
if (tiles == nil)
{
@ -1935,21 +1943,21 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
/* Only draw the notches if there's enough space. */
if (resizeBarRect.size.width < 30 * 2)
if (resizeBarRect.size.width < resizebarNotchWidth * 2)
return;
[[NSColor darkGrayColor] set];
PSmoveto(27.5, 1.0);
PSlineto(27.5, RESIZE_HEIGHT - 2.0);
PSmoveto(resizeBarRect.size.width - 28.5, 1.0);
PSlineto(resizeBarRect.size.width - 28.5, RESIZE_HEIGHT - 2.0);
PSmoveto(resizebarNotchWidth - 3 + 0.5, 1.0);
PSlineto(resizebarNotchWidth - 3 + 0.5, RESIZE_HEIGHT - 2.0);
PSmoveto(resizeBarRect.size.width - (resizebarNotchWidth - 2 + 0.5), 1.0);
PSlineto(resizeBarRect.size.width - (resizebarNotchWidth - 2 + 0.5), RESIZE_HEIGHT - 2.0);
PSstroke();
[[NSColor whiteColor] set];
PSmoveto(28.5, 1.0);
PSlineto(28.5, RESIZE_HEIGHT - 2.0);
PSmoveto(resizeBarRect.size.width - 27.5, 1.0);
PSlineto(resizeBarRect.size.width - 27.5, RESIZE_HEIGHT - 2.0);
PSmoveto(resizebarNotchWidth - 2 + 0.5, 1.0);
PSlineto(resizebarNotchWidth - 2 + 0.5, RESIZE_HEIGHT - 2.0);
PSmoveto(resizeBarRect.size.width - (resizebarNotchWidth - 3 + 0.5), 1.0);
PSlineto(resizeBarRect.size.width - (resizebarNotchWidth - 3 + 0.5), RESIZE_HEIGHT - 2.0);
PSstroke();
}
else

2
Source/GSXib5KeyedUnarchiver.h
View file

@ -41,9 +41,7 @@
GSXibElement *_runtimeAttributes;
NSMutableDictionary *_orderedObjectsDict;
NSArray *_resources;
NSMutableArray *_customClasses;
}
- (NSRange) decodeRangeForKey: (NSString*)key;
- (NSMutableArray *) customClasses;
@end

24
Source/GSXib5KeyedUnarchiver.m
View file

@ -750,9 +750,6 @@ static NSArray *XmlBoolDefaultYes = nil;
[_IBObjectContainer setElement: _connectionRecords forKey: @"connectionRecords"];
[_IBObjectContainer setElement: _objectRecords forKey: @"objectRecords"];
[_IBObjectContainer setElement: _flattenedProperties forKey: @"flattenedProperties"];
// Hold the dictionary which contains custom class information for Gorm/IB.
_customClasses = [[NSMutableArray alloc] initWithCapacity: 10];
}
- (void)dealloc
@ -765,30 +762,9 @@ static NSArray *XmlBoolDefaultYes = nil;
RELEASE(_orderedObjects);
RELEASE(_orderedObjectsDict);
RELEASE(_resources);
RELEASE(_customClasses);
[super dealloc];
}
- (NSMutableArray *) customClasses
{
return _customClasses;
}
- (void) createCustomClassRecordForId: (NSString *)theId
withParentClass: (NSString *)parentClassName
forCustomClass: (NSString *)customClassName
{
if (theId == nil || customClassName == nil)
return;
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
theId, @"id",
parentClassName, @"parentClassName",
customClassName, @"customClassName",nil];
[_customClasses addObject: dict];
// NSLog(@"theId = %@, parentClassName = %@, customClassName = %@", theId, parentClassName, customClassName);
}
- (void) parser: (NSXMLParser*)parser
didStartElement: (NSString*)elementName
namespaceURI: (NSString*)namespaceURI

102
Source/GSXibKeyedUnarchiver.m
View file

@ -83,6 +83,19 @@
return AUTORELEASE(unarchiver);
}
- (NSString *) _substituteClassForClassName: (NSString *)className
{
NSString *result = className;
NSDictionary *dict = [_customClasses objectForKey: className];
if (dict != nil)
{
result = [dict objectForKey: @"parentClassName"];
}
return result;
}
- (NSData *) _preProcessXib: (NSData *)data
{
NSData *result = data;
@ -143,8 +156,47 @@
id key = [[xmlKeys objectAtIndex:index] stringValue];
if ([key rangeOfString:@"CustomClassName"].location != NSNotFound)
{
// NSString *obj = [[xmlObjs objectAtIndex:index] stringValue];
[customClassDict setObject:[[xmlObjs objectAtIndex:index] stringValue] forKey:key];
NSString *cn = [[xmlObjs objectAtIndex: index] stringValue]; // className
[customClassDict setObject:cn forKey:key];
//
// If we are in IB/Gorm build the custom classes map so that we don't instantiate
// classes which don't exist (yet) in IB/Gorm. This allows editing of the model
// in IB/Gorm. If we are in the live app, don't bother as it's a waste of memory.
//
if ([NSClassSwapper isInInterfaceBuilder] == YES)
{
NSUInteger idx = [key rangeOfString: @"."].location;
if (idx != NSNotFound) // unlikely to be NSNotFound...
{
NSString *xpath = [NSString stringWithFormat: @"//object[@class=\"IBClassDescriber\"]"
@"//string[@key=\"className\"][text()=\"%@\"]"
@"/../string[@key=\"superclassName\"]", cn];
NSArray *descriptionObjs = [document nodesForXPath: xpath error: NULL];
if ([descriptionObjs count] > 0)
{
NSString *num = [key substringToIndex: idx];
NSXMLNode *descriptionNode = [descriptionObjs objectAtIndex: 0];
NSString *sc = [descriptionNode stringValue]; // superclassName
NSString *refXPath = [NSString stringWithFormat:
@"//object[@class=\"IBMutableOrderedSet\"][@key=\"objectRecords\"]"
@"/object/object[@class=\"IBObjectRecord\"]/int[@key=\"objectID\"]"
@"[text()=\"%@\"]/../reference[@key=\"object\"]/@ref", num];
NSArray *refNodes = [document nodesForXPath: refXPath error: NULL];
if ([refNodes count] > 0)
{
NSXMLElement *refNode = [refNodes objectAtIndex: 0];
NSString *refId = [refNode stringValue];
[self createCustomClassRecordForId: refId
withParentClass: sc
forCustomClass: cn];
}
}
}
}
}
}
}
@ -206,14 +258,16 @@
// If we are in the interface builder app, do not replace
// the existing classes with their custom subclasses.
if ([NSClassSwapper isInInterfaceBuilder] == NO)
NSString *clsName = className;
if ([NSClassSwapper isInInterfaceBuilder] == YES)
{
cls = NSClassFromString(className);
clsName = [self _substituteClassForClassName: className];
}
cls = NSClassFromString(clsName);
classNode = [classNodes objectAtIndex:0];
classAttr = [classNode attributeForName:@"class"];
[classAttr setStringValue:className];
[classAttr setStringValue: className];
if (cls != nil)
{
@ -232,7 +286,7 @@
id cellAttr = nil;
cellNode = [cellNodes objectAtIndex:0];
cellAttr = [cellNode attributeForName:@"class"];
[cellAttr setStringValue:cellClassString];
[cellAttr setStringValue: cellClassString];
}
}
}
@ -264,6 +318,9 @@
NSXMLParser *theParser;
NSData *theData = data;
// Dictionary which contains custom class information for Gorm/IB.
_customClasses = [[NSMutableDictionary alloc] init];
theData = [self _preProcessXib: data];
if (theData == nil)
{
@ -298,6 +355,7 @@
DESTROY(objects);
DESTROY(stack);
DESTROY(decoded);
DESTROY(_customClasses);
[super dealloc];
}
@ -364,11 +422,17 @@ didStartElement: (NSString*)elementName
}
}
- (id) allocObjectForClassName: (NSString*)classname
- (id) allocObjectForClassName: (NSString*)clsname
{
Class c = nil;
id delegate = [self delegate];
NSString *classname = clsname;
if ([NSClassSwapper isInInterfaceBuilder] == YES)
{
classname = [self _substituteClassForClassName: classname];
}
c = [self classForClassName: classname];
if (c == nil)
@ -1033,4 +1097,26 @@ didStartElement: (NSString*)elementName
{
return decoded;
}
- (NSDictionary *) customClasses
{
return _customClasses;
}
- (void) createCustomClassRecordForId: (NSString *)theId
withParentClass: (NSString *)parentClassName
forCustomClass: (NSString *)customClassName
{
if (theId == nil || customClassName == nil)
return;
NSMutableDictionary *dict =
[NSMutableDictionary dictionaryWithObjectsAndKeys:
parentClassName, @"parentClassName",
theId, @"id",nil];
[_customClasses setObject: dict
forKey: customClassName];
}
@end