Author: mlytwyn
Date: Fri Jun 26 20:05:15 2015
New Revision: 38707
URL: http://svn.gna.org/viewcvs/gnustep?rev=38707&view=rev
Log:
NSCell, NSClipView and NSCollectionView merges
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSCell.m
libs/gui/branches/gnustep_testplant_branch/Source/NSClipView.m
libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSCell.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSCell.m?rev=38707&r1=38706&r2=38707&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSCell.m (original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSCell.m Fri Jun 26
20:05:15 2015
@@ -1791,6 +1791,7 @@
return NO; // Otherwise return NO
}
+// Testplant-MAL-2015-06-26: Keeping testplant fixes for this method...
- (NSUInteger)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame
ofView:(NSView *)controlView
{
NSUInteger hitResult = NSCellHitNone;
@@ -2317,7 +2318,7 @@
_cell.shows_first_responder = YES;
_cell.in_editing = YES;
-#if 1
+#if 0
// Testplant-MAL-2015-06-20: merging removal causes focus ring issues...
// FIXME: we need to draw the focus ring, this works but
// there's something wrong about telling the view to come
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSClipView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSClipView.m?rev=38707&r1=38706&r2=38707&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSClipView.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSClipView.m Fri Jun
26 20:05:15 2015
@@ -180,6 +180,7 @@
df = [_documentView frame];
[self setBoundsOrigin: df.origin];
+ // Testplant-MAL-2015-06-26: Keeping testplant fixes...
if ([aView respondsToSelector: @selector(backgroundColor)])
{
[self setBackgroundColor: [(id)aView backgroundColor]];
@@ -239,15 +240,15 @@
- (void) setBounds: (NSRect)b
{
- // FIXME: Shouldn't the document view be marked as needing a redraw?
[super setBounds: b];
+ [self setNeedsDisplay: YES];
[_super_view reflectScrolledClipView: self];
}
- (void) setBoundsSize: (NSSize)aSize
{
- // FIXME: Shouldn't the document view be marked as needing a redraw?
[super setBoundsSize: aSize];
+ [self setNeedsDisplay: YES];
[_super_view reflectScrolledClipView: self];
}
@@ -274,8 +275,6 @@
/* Copy the portion of the view that is common before and after
scrolling. Then, document view needs to redraw the remaining
areas. */
-
-
/* Common part - which is a first approx of what we could
copy... */
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m?rev=38707&r1=38706&r2=38707&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSCollectionView.m
Fri Jun 26 20:05:15 2015
@@ -166,6 +166,7 @@
{
// Calling itemAtIndex: will eventually instantiate the collection view
item,
// if it hasn't been done already.
+ // Testplant-MAL-2015-06-26: Keeping testplant fixes...
if (index < [_items count])
{
NSCollectionViewItem *collectionItem = [self itemAtIndex: index];
@@ -476,6 +477,7 @@
{
[item setSelected: YES];
}
+ // Testplant-MAL-2015-06-26: Keeping testplant fixes...
// Frank LeGrand 4/25/13:
// We set this initial rect as a workaround for a weird display
// issue in our app where the item view would get drawn in front
@@ -527,7 +529,7 @@
return;
CGFloat width = [self bounds].size.width;
- //NSLog(@"tile: width = %g, previous width = %g", width, _tileWidth);
+ // Testplant-MAL-2015-06-26: Keeping testplant fixes...
if (isnan(width) || ABS(width - _tileWidth) <= 1)
return;
@@ -602,7 +604,6 @@
NSSize currentSize = [self frame].size;
if (!NSEqualSizes(currentSize, aSize))
{
- //NSLog(@"resizeSubviews: new size = %g x %g, currentSize = %g x %g",
aSize.width, aSize.height, currentSize.width, currentSize.height);
[self tile];
}
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
