Author: mlytwyn
Date: Fri Jun 26 19:34:42 2015
New Revision: 38706
URL: http://svn.gna.org/viewcvs/gnustep?rev=38706&view=rev
Log:
NSBox, NSBundleAdditions and NSButtonCell merges
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m
libs/gui/branches/gnustep_testplant_branch/Source/NSBundleAdditions.m
libs/gui/branches/gnustep_testplant_branch/Source/NSButtonCell.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m?rev=38706&r1=38705&r2=38706&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m (original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m Fri Jun 26
19:34:42 2015
@@ -462,22 +462,19 @@
- (BOOL) isOpaque
{
-#if 1 //TESTPLANT-MAL-MERGE-06202015
// FIXME: Depends on theme; if always returning NO is a performance hit
// we can check if GSTheme is going to draw an old-style opaque box
// or not.
return NO;
-#else
- if (_box_type == NSBoxCustom)
- {
- return !_transparent;
- }
- else
- {
- return YES;
- }
-#endif
-}
+ // if (_box_type == NSBoxCustom)
+ // {
+ // return !_transparent;
+ // }
+ // else
+ // {
+ // return YES;
+ // }
+ }
- (NSColor*) fillColor
{
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSBundleAdditions.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSBundleAdditions.m?rev=38706&r1=38705&r2=38706&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSBundleAdditions.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSBundleAdditions.m
Fri Jun 26 19:34:42 2015
@@ -34,6 +34,7 @@
#import <Foundation/NSArray.h>
#import <Foundation/NSBundle.h>
#import <Foundation/NSCoder.h>
+#import <Foundation/NSDebug.h>
#import <Foundation/NSDictionary.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSException.h>
@@ -281,6 +282,8 @@
- (NSString *) pathForNibResource: (NSString *)fileName
{
+ // Testplant-MAL-2015-06-26: This seems like a testplant fix
+ // so keeping over the main branches version...
NSMutableArray *array = [NSMutableArray arrayWithCapacity: 8];
NSArray *languages;
NSString *rootPath = [self bundlePath];
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSButtonCell.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSButtonCell.m?rev=38706&r1=38705&r2=38706&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSButtonCell.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSButtonCell.m Fri Jun
26 19:34:42 2015
@@ -973,7 +973,6 @@
buttonState = GSThemeDisabledState;
}
-#if 0 // Testplant-MAL-2015-06-20: Merged but causes button to show up
depressed???
/* If we are first responder, change to the corresponding
first responder state. Note that GSThemeDisabledState
doesn't have a first responder variant, currently. */
@@ -988,12 +987,10 @@
else if (buttonState == GSThemeNormalState)
buttonState = GSThemeFirstResponderState;
}
-#endif
return buttonState;
}
-#if 1
- (void) drawBezelWithFrame: (NSRect)cellFrame inView: (NSView *)controlView
{
GSThemeControlState buttonState = [self themeControlState];
@@ -1004,54 +1001,7 @@
style: _bezel_style
state: buttonState];
}
-#else
-- (void) drawBezelWithFrame: (NSRect)cellFrame inView: (NSView *)controlView
-{
- unsigned mask;
- GSThemeControlState buttonState = GSThemeNormalState;
- // set the mask
- if (_cell.is_highlighted)
- {
- mask = _highlightsByMask;
- if (_cell.state)
- {
- mask &= ~_showAltStateMask;
- }
- }
- else if (_cell.state)
- mask = _showAltStateMask;
- else
- mask = NSNoCellMask;
-
- /* Determine the background color.
- We draw when there is a border or when highlightsByMask
- is NSChangeBackgroundCellMask or NSChangeGrayCellMask,
- as required by our nextstep-like look and feel. */
- if (mask & (NSChangeGrayCellMask | NSChangeBackgroundCellMask))
- {
- buttonState = GSThemeHighlightedState;
- }
-
- /* Pushed in buttons contents are displaced to the bottom right 1px. */
- if (mask & NSPushInCellMask)
- {
- buttonState = GSThemeSelectedState;
- }
-
- if (_cell.is_disabled && buttonState != GSThemeHighlightedState)
- {
- buttonState = GSThemeDisabledState;
- }
-
- [[GSTheme theme] drawButton: cellFrame
- in: self
- view: controlView
- style: _bezel_style
- state: buttonState];
-}
-#endif
-
- (void) drawImage: (NSImage*)imageToDisplay
withFrame: (NSRect)cellFrame
inView: (NSView*)controlView
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
