gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 13:20:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge with trunk revision 40072

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40130 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-10-05 20:16:53 +00:00
parent be63eedc09
commit fd11511309
4 changed files with 89 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/NSButtonCell.m
View file

@ -683,7 +683,7 @@ typedef struct _GSButtonCellFlags
returns NO</p>*/
- (BOOL) isOpaque
{
#if 0
#if 0 // Testplant-MAL-10052016: keeping branch code...
// May not be opaque, due to themes
return NO;
#else
@ -807,6 +807,7 @@ typedef struct _GSButtonCellFlags
[self setAlignment: NSLeftTextAlignment];
[self setBordered: NO];
[self setBezeled: NO];
// Testplant-MAL-10052016: keeping branch code...
[self setBezelStyle:NSRegularSquareBezelStyle];
[self setImageDimsWhenDisabled: NO];
break;
@ -1506,6 +1507,7 @@ typedef struct _GSButtonCellFlags
return s;
}
// Testplant-MAL-10052016: keeping branch code...
- (NSRect)insetFrame:(NSRect)frame withMargins:(GSThemeMargins)margins
{
NSRect result = frame;
@ -1555,6 +1557,7 @@ typedef struct _GSButtonCellFlags
border = [[GSTheme theme] buttonMarginsForCell: self
style: _bezel_style
state: buttonState];
// Testplant-MAL-10052016: keeping branch code...
interiorFrame = [self insetFrame:theRect withMargins:border];
/* Pushed in buttons contents are displaced to the bottom right 1px. */
@ -1567,6 +1570,7 @@ typedef struct _GSButtonCellFlags
}
else
{
// Testplant-MAL-10052016: keeping branch code...
GSThemeMargins margins = [[GSTheme theme] buttonMarginsForCell: self
style: _bezel_style
state: GSThemeNormalState];