gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-04-22 22:20:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Corrected rect drawing bug under ART and simplified headers.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@20506 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2004-12-31 13:21:30 +00:00
parent 162768468f
commit cfa2fe4385
4 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-12-31 08:22 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.h: Added GormFilesOwner to @class declaration.
* Gorm.m: Made rect drawn around objects thinner to prevent
residual lines from remaining when the rect is erased.
* Palettes/1Windows/main.m: Simplified includes.
2004-12-28 21:21 Gregory John Casamento <greg_casamento@yahoo.com>
* GormImageEditor.m: Added check to see if object responds

39
Gorm.m
View file

@ -479,15 +479,16 @@ static NSImage *testingImage = nil;
if (window != nil)
{
NSView *view = [[window contentView] superview];
rect.origin.x++;
rect.size.width--;
rect.size.height--;
NSRect imageRect = rect;
imageRect.origin.x++;
//rect.size.width--;
//rect.size.height--;
[view lockFocus];
[[NSColor greenColor] set];
NSFrameRectWithWidth(rect, 2);
NSFrameRectWithWidth(rect, 1);
[sourceImage compositeToPoint: rect.origin
[sourceImage compositeToPoint: imageRect.origin
operation: NSCompositeSourceOver];
[view unlockFocus];
[window flushWindow];
@ -500,17 +501,18 @@ static NSImage *testingImage = nil;
if (window != nil)
{
NSView *view = [[window contentView] superview];
NSRect imageRect = rect;
rect.origin.x += 3;
rect.origin.y += 2;
rect.size.width -= 5;
rect.size.height -= 5;
imageRect.origin.x += 3;
imageRect.origin.y += 2;
// rect.size.width -= 5;
// rect.size.height -= 5;
[view lockFocus];
[[NSColor purpleColor] set];
NSFrameRectWithWidth(rect, 2);
NSFrameRectWithWidth(rect, 1);
rect.origin.x += [targetImage size].width;
[targetImage compositeToPoint: rect.origin
imageRect.origin.x += [targetImage size].width;
[targetImage compositeToPoint: imageRect.origin
operation: NSCompositeSourceOver];
[view unlockFocus];
[window flushWindow];
@ -523,15 +525,16 @@ static NSImage *testingImage = nil;
if (window != nil)
{
NSView *view = [[window contentView] superview];
NSRect imageRect = rect;
rect.origin.x++;
rect.size.width--;
rect.size.height--;
imageRect.origin.x++;
// rect.size.width--;
// rect.size.height--;
[view lockFocus];
[[NSColor purpleColor] set];
NSFrameRectWithWidth(rect, 2);
NSFrameRectWithWidth(rect, 1);
[targetImage compositeToPoint: rect.origin
[targetImage compositeToPoint: imageRect.origin
operation: NSCompositeSourceOver];
[view unlockFocus];
[window flushWindow];

2
GormDocument.h
View file

@ -30,7 +30,7 @@
#include <Foundation/Foundation.h>
#include <GNUstepGUI/GSNibTemplates.h>
@class GormClassManager, GormClassEditor, GormObjectProxy;
@class GormClassManager, GormClassEditor, GormObjectProxy, GormFilesOwner;
/*
* Each document has a GormFirstResponder object that is used as a placeholder

5
Palettes/1Windows/main.m
View file

@ -23,7 +23,10 @@
*/
#include <Foundation/Foundation.h>
#include <AppKit/AppKit.h>
#include "GormPrivate.h"
#include <InterfaceBuilder/IBPalette.h>
#include <InterfaceBuilder/IBInspector.h>
#include <InterfaceBuilder/IBApplicationAdditions.h>
#include "GormDocument.h"
#include "GormNSWindow.h"
#include "GormNSPanel.h"