Author: mlytwyn
Date: Wed Mar 9 16:09:26 2016
New Revision: 39504
URL: http://svn.gna.org/viewcvs/gnustep?rev=39504&view=rev
Log:
Merge more code with gui main branch revision 39484
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSImageMagickImageRep.m
libs/gui/branches/gnustep_testplant_branch/Source/GSTextFinder.m
libs/gui/branches/gnustep_testplant_branch/Source/GSTheme.m
libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m
libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSImageMagickImageRep.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSImageMagickImageRep.m?rev=39504&r1=39503&r2=39504&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSImageMagickImageRep.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSImageMagickImageRep.m
Wed Mar 9 16:09:26 2016
@@ -31,10 +31,10 @@
#import <Foundation/NSArray.h>
#import <Foundation/NSAffineTransform.h>
#import <Foundation/NSCoder.h>
+#import <Foundation/NSDebug.h>
#import <Foundation/NSData.h>
#import <Foundation/NSTask.h>
#import <Foundation/NSProcessInfo.h>
-#import <GNUstepBase/NSDebug+GNUstepBase.h>
#import "AppKit/NSBitmapImageRep.h"
#import "AppKit/NSGraphics.h"
#import "AppKit/NSPasteboard.h"
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSTextFinder.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSTextFinder.m?rev=39504&r1=39503&r2=39504&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSTextFinder.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSTextFinder.m Wed Mar
9 16:09:26 2016
@@ -480,7 +480,8 @@
if ([ignoreCaseButton state] != NSOffState)
{
*options |= NSCaseInsensitiveSearch;
- *options &= ~NSLiteralSearch; // literal search is always
case-sensitive, so it must be removed in this case
+ // literal search is always case-sensitive, so it must be removed in
this case
+ *options &= ~NSLiteralSearch;
}
else
{
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSTheme.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSTheme.m?rev=39504&r1=39503&r2=39504&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSTheme.m (original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSTheme.m Wed Mar 9
16:09:26 2016
@@ -39,7 +39,6 @@
#import <Foundation/NSPathUtilities.h>
#import <Foundation/NSSet.h>
#import <Foundation/NSUserDefaults.h>
-#import "GNUstepBase/GSObjCRuntime.h"
#import "GNUstepGUI/GSTheme.h"
#import "AppKit/NSApplication.h"
#import "AppKit/NSButtonCell.h"
@@ -112,18 +111,30 @@
NSString *GSBoxBorder = @"GSBoxBorder";
/* NSTabView parts */
-NSString *GSTabViewSelectedTabFill = @"GSTabViewSelectedTabFill";
-NSString *GSTabViewUnSelectedTabFill = @"GSTabViewUnSelectedTabFill";
-NSString *GSTabViewBackgroundTabFill = @"GSTabViewBackgroundTabFill";
-NSString *GSTabViewBottomSelectedTabFill =
@"GSTabViewBottomSelectedTabFill";
-NSString *GSTabViewBottomUnSelectedTabFill =
@"GSTabViewBottomUnSelectedTabFill";
-NSString *GSTabViewBottomBackgroundTabFill =
@"GSTabViewBottomBackgroundTabFill";
-NSString *GSTabViewLeftSelectedTabFill =
@"GSTabViewLeftSelectedTabFill";
-NSString *GSTabViewLeftUnSelectedTabFill =
@"GSTabViewLeftUnSelectedTabFill";
-NSString *GSTabViewLeftBackgroundTabFill =
@"GSTabViewLeftBackgroundTabFill";
-NSString *GSTabViewRightSelectedTabFill =
@"GSTabViewRightSelectedTabFill";
-NSString *GSTabViewRightUnSelectedTabFill =
@"GSTabViewRightUnSelectedTabFill";
-NSString *GSTabViewRightBackgroundTabFill =
@"GSTabViewRightBackgroundTabFill";
+NSString *GSTabViewSelectedTabFill
+ = @"GSTabViewSelectedTabFill";
+NSString *GSTabViewUnSelectedTabFill
+ = @"GSTabViewUnSelectedTabFill";
+NSString *GSTabViewBackgroundTabFill
+ = @"GSTabViewBackgroundTabFill";
+NSString *GSTabViewBottomSelectedTabFill
+ = @"GSTabViewBottomSelectedTabFill";
+NSString *GSTabViewBottomUnSelectedTabFill
+ = @"GSTabViewBottomUnSelectedTabFill";
+NSString *GSTabViewBottomBackgroundTabFill
+ = @"GSTabViewBottomBackgroundTabFill";
+NSString *GSTabViewLeftSelectedTabFill
+ = @"GSTabViewLeftSelectedTabFill";
+NSString *GSTabViewLeftUnSelectedTabFill
+ = @"GSTabViewLeftUnSelectedTabFill";
+NSString *GSTabViewLeftBackgroundTabFill
+ = @"GSTabViewLeftBackgroundTabFill";
+NSString *GSTabViewRightSelectedTabFill
+ = @"GSTabViewRightSelectedTabFill";
+NSString *GSTabViewRightUnSelectedTabFill
+ = @"GSTabViewRightUnSelectedTabFill";
+NSString *GSTabViewRightBackgroundTabFill
+ = @"GSTabViewRightBackgroundTabFill";
NSString *GSThemeDidActivateNotification
@@ -185,14 +196,22 @@
{
switch (segmentStyle)
{
- case NSSegmentStyleAutomatic: return @"NSSegmentStyleAutomatic";
- case NSSegmentStyleRounded: return @"NSSegmentStyleRounded";
- case NSSegmentStyleTexturedRounded: return
@"NSSegmentStyleTexturedRounded";
- case NSSegmentStyleRoundRect: return @"NSSegmentStyleRoundRect";
- case NSSegmentStyleTexturedSquare: return
@"NSSegmentStyleTexturedSquare";
- case NSSegmentStyleCapsule: return @"NSSegmentStyleCapsule";
- case NSSegmentStyleSmallSquare: return @"NSSegmentStyleSmallSquare";
- default: return nil;
+ case NSSegmentStyleAutomatic:
+ return @"NSSegmentStyleAutomatic";
+ case NSSegmentStyleRounded:
+ return @"NSSegmentStyleRounded";
+ case NSSegmentStyleTexturedRounded:
+ return @"NSSegmentStyleTexturedRounded";
+ case NSSegmentStyleRoundRect:
+ return @"NSSegmentStyleRoundRect";
+ case NSSegmentStyleTexturedSquare:
+ return @"NSSegmentStyleTexturedSquare";
+ case NSSegmentStyleCapsule:
+ return @"NSSegmentStyleCapsule";
+ case NSSegmentStyleSmallSquare:
+ return @"NSSegmentStyleSmallSquare";
+ default:
+ return nil;
}
}
@@ -201,26 +220,46 @@
{
switch (bezelStyle)
{
- case NSRoundedBezelStyle: return @"NSRoundedBezelStyle";
- case NSRegularSquareBezelStyle: return @"NSRegularSquareBezelStyle";
- case NSThickSquareBezelStyle: return @"NSThickSquareBezelStyle";
- case NSThickerSquareBezelStyle: return @"NSThickerSquareBezelStyle";
- case NSDisclosureBezelStyle: return @"NSDisclosureBezelStyle";
- case NSShadowlessSquareBezelStyle: return
@"NSShadowlessSquareBezelStyle";
- case NSCircularBezelStyle: return @"NSCircularBezelStyle";
- case NSTexturedSquareBezelStyle: return @"NSTexturedSquareBezelStyle";
- case NSHelpButtonBezelStyle: return @"NSHelpButtonBezelStyle";
- case NSSmallSquareBezelStyle: return @"NSSmallSquareBezelStyle";
- case NSTexturedRoundedBezelStyle: return
@"NSTexturedRoundedBezelStyle";
- case NSRoundRectBezelStyle: return @"NSRoundRectBezelStyle";
- case NSRecessedBezelStyle: return @"NSRecessedBezelStyle";
- case NSRoundedDisclosureBezelStyle: return
@"NSRoundedDisclosureBezelStyle";
- case NSNeXTBezelStyle: return @"NSNeXTBezelStyle";
- case NSPushButtonBezelStyle: return @"NSPushButtonBezelStyle";
- case NSSmallIconButtonBezelStyle: return
@"NSSmallIconButtonBezelStyle";
- case NSMediumIconButtonBezelStyle: return
@"NSMediumIconButtonBezelStyle";
- case NSLargeIconButtonBezelStyle: return
@"NSLargeIconButtonBezelStyle";
- default: return nil;
+ case NSRoundedBezelStyle:
+ return @"NSRoundedBezelStyle";
+ case NSRegularSquareBezelStyle:
+ return @"NSRegularSquareBezelStyle";
+ case NSThickSquareBezelStyle:
+ return @"NSThickSquareBezelStyle";
+ case NSThickerSquareBezelStyle:
+ return @"NSThickerSquareBezelStyle";
+ case NSDisclosureBezelStyle:
+ return @"NSDisclosureBezelStyle";
+ case NSShadowlessSquareBezelStyle:
+ return @"NSShadowlessSquareBezelStyle";
+ case NSCircularBezelStyle:
+ return @"NSCircularBezelStyle";
+ case NSTexturedSquareBezelStyle:
+ return @"NSTexturedSquareBezelStyle";
+ case NSHelpButtonBezelStyle:
+ return @"NSHelpButtonBezelStyle";
+ case NSSmallSquareBezelStyle:
+ return @"NSSmallSquareBezelStyle";
+ case NSTexturedRoundedBezelStyle:
+ return @"NSTexturedRoundedBezelStyle";
+ case NSRoundRectBezelStyle:
+ return @"NSRoundRectBezelStyle";
+ case NSRecessedBezelStyle:
+ return @"NSRecessedBezelStyle";
+ case NSRoundedDisclosureBezelStyle:
+ return @"NSRoundedDisclosureBezelStyle";
+ case NSNeXTBezelStyle:
+ return @"NSNeXTBezelStyle";
+ case NSPushButtonBezelStyle:
+ return @"NSPushButtonBezelStyle";
+ case NSSmallIconButtonBezelStyle:
+ return @"NSSmallIconButtonBezelStyle";
+ case NSMediumIconButtonBezelStyle:
+ return @"NSMediumIconButtonBezelStyle";
+ case NSLargeIconButtonBezelStyle:
+ return @"NSLargeIconButtonBezelStyle";
+ default:
+ return nil;
}
}
@@ -1150,13 +1189,15 @@
fullName = [aName stringByAppendingString: @"Disabled"];
break;
case GSThemeHighlightedFirstResponderState:
- fullName = [aName stringByAppendingString:
@"HighlightedFirstResponder"];
+ fullName
+ = [aName stringByAppendingString: @"HighlightedFirstResponder"];
break;
case GSThemeHighlightedState:
fullName = [aName stringByAppendingString: @"Highlighted"];
break;
case GSThemeSelectedFirstResponderState:
- fullName = [aName stringByAppendingString:
@"SelectedFirstResponder"];
+ fullName
+ = [aName stringByAppendingString: @"SelectedFirstResponder"];
break;
case GSThemeSelectedState:
fullName = [aName stringByAppendingString: @"Selected"];
@@ -1184,8 +1225,7 @@
name = [info objectForKey: @"FillStyle"];
style = GSThemeFillStyleFromString(name);
- if (style < GSThemeFillStyleNone)
- style = GSThemeFillStyleNone;
+ if (style < GSThemeFillStyleNone) style = GSThemeFillStyleNone;
x = [[info objectForKey: @"HorizontalDivision"] floatValue];
y = [[info objectForKey: @"VerticalDivision"] floatValue];
file = [info objectForKey: @"FileName"];
@@ -1206,7 +1246,8 @@
if ([[info objectForKey: @"NinePatch"] boolValue]
|| [file hasSuffix: @".9"])
{
- tiles = [[GSDrawTiles alloc] initWithNinePatchImage:
image];
+ tiles = [[GSDrawTiles alloc]
+ initWithNinePatchImage: image];
[tiles setFillStyle: GSThemeFillStyleScaleAll];
}
else
@@ -1231,10 +1272,12 @@
inDirectory: @"ThemeTiles"];
if (imagePath != nil)
{
- image = [[_imageClass alloc] initWithContentsOfFile: imagePath];
+ image
+ = [[_imageClass alloc] initWithContentsOfFile: imagePath];
if (image != nil)
{
- tiles = [[GSDrawTiles alloc] initWithNinePatchImage: image];
+ tiles = [[GSDrawTiles alloc]
+ initWithNinePatchImage: image];
[tiles setFillStyle: GSThemeFillStyleScaleAll];
RELEASE(image);
}
@@ -1257,7 +1300,8 @@
inDirectory: @"ThemeTiles"];
if (imagePath != nil)
{
- image = [[_imageClass alloc] initWithContentsOfFile:
imagePath];
+ image
+ = [[_imageClass alloc] initWithContentsOfFile: imagePath];
if (image != nil)
{
tiles = [[GSDrawTiles alloc] initWithImage: image];
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m?rev=39504&r1=39503&r2=39504&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSToolTips.m Wed Mar
9 16:09:26 2016
@@ -643,6 +643,17 @@
attributes: attributes];
textSize = [toolTipText size];
+ // TESTPLANT-MAL-03092016: Merged...
+ if (textSize.width > 300)
+ {
+ NSRect rect;
+ rect = [toolTipText boundingRectWithSize: NSMakeSize(300, 1e7)
+ options: 0];
+ textSize = rect.size;
+ // This extra pixel is needed, otherwise the last line gets cut off.
+ textSize.height += 1;
+ }
+
/* Create window just off the current mouse position
* Constrain it to be on screen, shrinking if necessary.
*/
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m?rev=39504&r1=39503&r2=39504&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSToolbarView.m Wed Mar
9 16:09:26 2016
@@ -52,6 +52,7 @@
#import "NSToolbarFrameworkPrivate.h"
+// TESTPLANT-MAL-2015: Modified to match closer with Cocoa...
typedef enum {
ToolbarViewDefaultHeight = 56,
ToolbarViewRegularHeight = 56,
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
