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

Merge pull request #124 from nongio/windowdecoration-expose

Browse source 
Add helper methods in GSWindowDecorator protocol
This commit is contained in:
Fred Kiefer 2021-12-27 17:51:50 +01:00 committed by GitHub
commit bc9d477a9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Headers/Additions/GNUstepGUI/GSWindowDecorationView.h
View file

@ -32,6 +32,12 @@
@class NSWindow;
typedef enum _GSResizeEdgeMode {
GSResizeEdgeBottomLeftMode = 0,
GSResizeEdgeBottomRightMode = 1,
GSResizeEdgeBottomMode = 2,
} GSResizeEdgeMode;
// These are implemented as class methods on GSWindowDecorationView
@protocol GSWindowDecorator
- (id) newWindowDecorationViewWithFrame: (NSRect)frame
@ -42,6 +48,10 @@
styleMask: (NSUInteger)aStyle;
- (CGFloat) minFrameWidthWithTitle: (NSString *)aTitle
styleMask: (NSUInteger)aStyle;
- (BOOL) pointInContentRect:(NSPoint)point;
- (BOOL) pointInTitleBarRect:(NSPoint)point;
- (BOOL) pointInResizeBarRect:(NSPoint)point;
- (GSResizeEdgeMode) resizeModeForPoint:(NSPoint)point;
@end

72
Source/GSStandardWindowDecorationView.m
View file

@ -114,6 +114,10 @@
[theme titlebarButtonSize], [theme titlebarButtonSize]);
[closeButton setFrame: closeButtonRect];
}
else
{
closeButtonRect = NSZeroRect;
}
if (hasMiniaturizeButton)
{
@ -122,6 +126,11 @@
[theme titlebarButtonSize], [theme titlebarButtonSize]);
[miniaturizeButton setFrame: miniaturizeButtonRect];
}
else
{
miniaturizeButtonRect = NSZeroRect;
}
}
- (id) initWithFrame: (NSRect)frame
@ -268,7 +277,7 @@
static NSRect
calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint,
int mode, NSSize minSize, NSSize maxSize)
GSResizeEdgeMode mode, NSSize minSize, NSSize maxSize)
{
NSRect newFrame = frame;
newFrame.origin.y = point.y - firstPoint.y;
@ -279,7 +288,7 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint,
newFrame.origin.y = NSMaxY(frame) - newFrame.size.height;
}
if (mode == 0)
if (mode == GSResizeEdgeBottomLeftMode)
{
newFrame.origin.x = point.x - firstPoint.x;
newFrame.size.width = NSMaxX(frame) - newFrame.origin.x;
@ -290,7 +299,7 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint,
newFrame.origin.x = NSMaxX(frame) - newFrame.size.width;
}
}
else if (mode == 1)
else if (mode == GSResizeEdgeBottomRightMode)
{
newFrame.size.width = point.x - frame.origin.x + frame.size.width
- firstPoint.x;
@ -315,23 +324,9 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint,
NSSize minSize, maxSize;
int num = 0;
/*
0 drag lower left corner
1 drag lower right corner
2 drag lower edge
*/
int mode;
firstPoint = [event locationInWindow];
if (resizeBarRect.size.width < 30 * 2
&& firstPoint.x < resizeBarRect.size.width / 2)
mode = 0;
else if (firstPoint.x > resizeBarRect.size.width - 29)
mode = 1;
else if (firstPoint.x < 29)
mode = 0;
else
mode = 2;
GSResizeEdgeMode mode = [self resizeModeForPoint: firstPoint];
frame = [window frame];
minSize = [window minSize];
@ -379,23 +374,56 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint,
return YES;
}
- (BOOL) pointInContentRect:(NSPoint)point
{
return NSPointInRect(point, contentRect);
}
- (BOOL) pointInTitleBarRect:(NSPoint)point
{
return NSPointInRect(point, titleBarRect);
}
- (BOOL) pointInResizeBarRect:(NSPoint)point
{
return NSPointInRect(point, resizeBarRect);
}
- (GSResizeEdgeMode) resizeModeForPoint:(NSPoint)point
{
GSResizeEdgeMode mode;
if (resizeBarRect.size.width < 30 * 2
&& point.x < resizeBarRect.size.width / 2)
mode = GSResizeEdgeBottomLeftMode;
else if (point.x > resizeBarRect.size.width - 29)
mode = GSResizeEdgeBottomRightMode;
else if (point.x < 29)
mode = GSResizeEdgeBottomLeftMode;
else
mode = GSResizeEdgeBottomMode;
return mode;
}
- (void) mouseDown: (NSEvent *)event
{
NSPoint p = [self convertPoint: [event locationInWindow] fromView: nil];
if (NSPointInRect(p, contentRect))
if ([self pointInContentRect:p])
{
[super mouseDown: event];
return;
}
if (NSPointInRect(p, titleBarRect))
if ([self pointInTitleBarRect:p])
{
[self moveWindowStartingWithEvent: event];
return;
}
if (NSPointInRect(p, resizeBarRect))
if ([self pointInResizeBarRect:p])
{
[self resizeWindowStartingWithEvent: event];
return;