Author: mlytwyn
Date: Thu Dec 31 21:28:55 2015
New Revision: 39247
URL: http://svn.gna.org/viewcvs/gnustep?rev=39247&view=rev
Log:
Use value(s) from super instead of duplicating where possible - make
NSRegularSquareBezelStyle zero margins
Modified:
plugins/themes/WinUXTheme/WinNSButton.m
Modified: plugins/themes/WinUXTheme/WinNSButton.m
URL:
http://svn.gna.org/viewcvs/gnustep/plugins/themes/WinUXTheme/WinNSButton.m?rev=39247&r1=39246&r2=39247&view=diff
==============================================================================
--- plugins/themes/WinUXTheme/WinNSButton.m (original)
+++ plugins/themes/WinUXTheme/WinNSButton.m Thu Dec 31 21:28:55 2015
@@ -91,6 +91,7 @@
switch (style)
{
case NSRoundRectBezelStyle:
+ margins = [super buttonMarginsForCell:cell style:style state:state];
break;
case NSTexturedRoundedBezelStyle:
@@ -120,22 +121,17 @@
break;
case NSTexturedSquareBezelStyle:
- margins.left = 3; margins.top = 1; margins.right = 3; margins.bottom = 1;
+ margins = [super buttonMarginsForCell:cell style:style state:state];
break;
case NSRegularSquareBezelStyle:
- margins.left = 2; margins.top = 2; margins.right = 2; margins.bottom = 2;
break;
case NSShadowlessSquareBezelStyle:
- break;
-
case NSThickSquareBezelStyle:
- margins.left = 3; margins.top = 3; margins.right = 3; margins.bottom = 3;
- break;
-
case NSThickerSquareBezelStyle:
- margins.left = 4; margins.top = 4; margins.right = 4; margins.bottom = 4;
+ // Currently defaulting to super's margins...
+ margins = [super buttonMarginsForCell:cell style:style state:state];
break;
case NSCircularBezelStyle:
@@ -158,18 +154,13 @@
break;
case NSHelpButtonBezelStyle:
- margins.left = 2; margins.top = 3; margins.right = 2; margins.bottom = 3;
- break;
-
case NSDisclosureBezelStyle:
case NSRoundedDisclosureBezelStyle:
case NSRecessedBezelStyle:
- // FIXME
- margins.left = 3; margins.top = 3; margins.right = 3; margins.bottom = 3;
- break;
+ // Currently defaulting to super's margins...
default:
- margins.left = 3; margins.top = 3; margins.right = 3; margins.bottom = 3;
+ margins = [super buttonMarginsForCell:cell style:style state:state];
break;
}
return margins;
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
