gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 19:10:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge more code with gui main branch revision 39484

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@39504 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-03-09 15:09:26 +00:00
parent 6360094289
commit 2088ec1ab5
5 changed files with 108 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/GSImageMagickImageRep.m
View file

@ -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"

3
Source/GSTextFinder.m
View file

@ -480,7 +480,8 @@ static GSTextFinder *sharedTextFinder;
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
{

142
Source/GSTheme.m
View file

@ -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 *GSSliderVerticalTrack = @"GSSliderVerticalTrack";
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 @@ GSStringFromSegmentStyle(NSSegmentStyle segmentStyle)
{
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 @@ GSStringFromBezelStyle(NSBezelStyle bezelStyle)
{
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
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 @@ typedef struct {
inDirectory: @"ThemeTiles"];
if (imagePath != nil)
{
image = [[_imageClass alloc] initWithContentsOfFile: imagePath];
image
= [[_imageClass alloc] initWithContentsOfFile: imagePath];
if (image != nil)
{
tiles = [[GSDrawTiles alloc] initWithImage: image];

11
Source/GSToolTips.m
View file

@ -643,6 +643,17 @@ static BOOL restoreMouseMoved;
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.
*/

1
Source/GSToolbarView.m
View file

@ -52,6 +52,7 @@
#import "NSToolbarFrameworkPrivate.h"
// TESTPLANT-MAL-2015: Modified to match closer with Cocoa...
typedef enum {
ToolbarViewDefaultHeight = 56,
ToolbarViewRegularHeight = 56,