Merge some code with main brnch revision 39289

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@39326 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-02-01 22:08:22 +00:00
parent 3e5185efa1
commit ffb26b5d34
14 changed files with 738 additions and 231 deletions

View file

@ -630,6 +630,8 @@ GSSetDragTypes(NSView* obj, NSArray *types)
//_nextKeyView = 0;
//_previousKeyView = 0;
_alphaValue = 1.0;
return self;
}
@ -1639,6 +1641,30 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
}
}
- (CGFloat) alphaValue
{
return _alphaValue;
}
- (void)setAlphaValue: (CGFloat)alpha
{
_alphaValue = alpha;
}
- (CGFloat) frameCenterRotation
{
// FIXME this is dummy, we don't have layers yet
return 0.0;
}
- (void) setFrameCenterRotation:(CGFloat)rot;
{
// FIXME this is dummy, we don't have layers yet
// we probably need a Matrix akin frame rotation.
}
- (NSRect) centerScanRect: (NSRect)aRect
{
NSAffineTransform *matrix;
@ -2810,7 +2836,6 @@ in the main thread.
const NSRect inBase = [self convertRectToBase: _invalidRect];
const NSRect inBaseRounded = NSIntegralRect(inBase);
_invalidRect = [self convertRectFromBase: inBaseRounded];
}
else
{