gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 06:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move color selection into the theme

Browse source
This commit is contained in:
Gregory John Casamento 2020-04-22 17:44:04 -04:00
parent 57a8720cd8
commit 5d1ec31ef2
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Headers/Additions/GNUstepGUI/GSTheme.h
View file

@ -959,14 +959,10 @@ APPKIT_EXPORT NSString *GSThemeWillDeactivateNotification;
- (void) drawStepperHighlightDownButton: (NSRect)aRect;
// NSSwitch drawing methods
- (void) drawSwitchKnob: (NSRect)frame
withColor: (NSColor*)backgroundColor
forState: (NSControlStateValue)value;
- (void) drawSwitchBezel: (NSRect)frame
withOnColor: (NSColor*)onColor
withOffColor: (NSColor*)offColor
forState: (NSControlStateValue)v;
- (void) drawSwitchInRect: (NSRect)rect

11
Source/GSThemeDrawing.m
View file

@ -819,18 +819,16 @@
// NSSwitch drawing methods
- (void) drawSwitchBezel: (NSRect)frame
withOnColor: (NSColor*)onColor
withOffColor: (NSColor*)offColor
forState: (NSControlStateValue)v
{
NSBezierPath *p;
NSPoint point;
CGFloat radius;
NSColor *backgroundColor = offColor;
NSColor *backgroundColor = [NSColor windowBackgroundColor]; // offColor;
if (NSControlStateValueOn == v)
{
backgroundColor = onColor;
backgroundColor = [NSColor selectedControlColor]; // onColor;
}
// make smaller than enclosing frame
@ -886,11 +884,11 @@
}
- (void) drawSwitchKnob: (NSRect)frame
withColor: (NSColor*)backgroundColor
forState: (NSControlStateValue)value
{
// make smaller so that it does not touch frame
NSColor *backgroundColor = [NSColor windowBackgroundColor];
NSBezierPath *oval;
NSRect rect = NSZeroRect;
CGFloat w = (frame.size.width / 2) - 2;
@ -934,13 +932,10 @@
{
// Draw the well bezel
[self drawSwitchBezel: rect
withOnColor: [NSColor selectedControlColor]
withOffColor: [NSColor windowBackgroundColor]
forState: state];
// Draw the knob
[self drawSwitchKnob: rect
withColor: [NSColor windowBackgroundColor]
forState: state];
}