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

Merge branch 'master' into NSSpeechRecognizer_branch

Browse source
This commit is contained in:
Gregory John Casamento 2020-02-04 06:03:47 -05:00
commit ebefe3805b
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2020-01-31 Sergii Stoian <stoyan255@gmail.com>
* Source/GSTitleView.m (mouseDown:): limit menu movement to screen
frame for top/left/right edges. Menu can be moved to the bottom until
title is completely visible.
2020-01-27 Sergii Stoian <stoyan255@gmail.com>
* Source/NSWindow.m (applicationDidChangeScreenParameters): take into

39
Source/GSTitleView.m
View file

@ -2,7 +2,7 @@
Copyright (C) 2003 Free Software Foundation, Inc.
Author: Serg Stoyan <stoyan@on.com.ua>
Author: Sergii Stoian <stoyan255@gmail.com>
Date: Mar 2003
This file is part of the GNUstep GUI Library.
@ -41,6 +41,7 @@
#import "AppKit/NSStringDrawing.h"
#import "AppKit/NSView.h"
#import "AppKit/NSWindow.h"
#import "AppKit/NSScreen.h"
#import "GNUstepGUI/GSTitleView.h"
#import "GNUstepGUI/GSTheme.h"
@ -238,9 +239,32 @@
NSDate *theDistantFuture = [NSDate distantFuture];
NSPoint startWindowOrigin;
NSPoint endWindowOrigin;
NSRect screenFrame = NSZeroRect;
CGFloat leftLimit = -1.0;
CGFloat topLimit = -1.0 ;
CGFloat rightLimit = -1.0;
CGFloat bottomLimit = 0.0;
NSDebugLLog (@"NSMenu", @"Mouse down in title!");
// Define move constrains for menu
if (_ownedByMenu)
{
NSRect windowFrame;
NSScreen *screen;
if (_window && (screen = [_window screen]))
{
windowFrame = [_window frame];
screenFrame = [screen frame];
leftLimit = screenFrame.origin.x;
topLimit = NSMaxY(screenFrame) - windowFrame.size.height;
rightLimit = NSMaxX(screenFrame) - windowFrame.size.width;
bottomLimit = screenFrame.origin.y -
(windowFrame.size.height - [self frame].size.height);
}
}
// Remember start position of window
startWindowOrigin = [_window frame].origin;
@ -275,6 +299,19 @@
origin.y += (location.y - lastLocation.y);
if (_ownedByMenu)
{
if (screenFrame.size.width > 0 && screenFrame.size.height > 0)
{
if (origin.x <= leftLimit)
origin.x = leftLimit;
else if (origin.x >= rightLimit)
origin.x = rightLimit;
if (origin.y >= topLimit)
origin.y = topLimit;
else if (origin.y <= bottomLimit)
origin.y = bottomLimit;
}
[_owner nestedSetFrameOrigin: origin];
}
else