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

Add color for disabled state

Browse source
This commit is contained in:
Gregory John Casamento 2020-04-24 02:34:59 -04:00
parent ab83e1ef81
commit fdd51ae2df
4 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Source/GSThemeDrawing.m
View file

@ -820,15 +820,21 @@
- (void) drawSwitchBezel: (NSRect)frame
forState: (NSControlStateValue)v
enabled: (BOOL)enabled
{
NSBezierPath *p;
NSPoint point;
CGFloat radius;
NSColor *backgroundColor = [NSColor windowBackgroundColor]; // offColor;
NSColor *backgroundColor = [NSColor selectedControlColor]; // onColor;
if (NSControlStateValueOn == v)
if (NSControlStateValueOn != v)
{
backgroundColor = [NSColor selectedControlColor]; // onColor;
backgroundColor = [NSColor windowBackgroundColor]; // offColor;
}
if (enabled == NO)
{
backgroundColor = [NSColor disabledControlTextColor];
}
// make smaller than enclosing frame
@ -885,10 +891,11 @@
- (void) drawSwitchKnob: (NSRect)frame
forState: (NSControlStateValue)value
enabled: (BOOL)enabled
{
// make smaller so that it does not touch frame
NSColor *backgroundColor = [NSColor windowBackgroundColor];
NSColor *backgroundColor = enabled ? [NSColor windowBackgroundColor] : [NSColor disabledControlTextColor];
NSBezierPath *oval;
NSRect rect = NSZeroRect;
CGFloat w = (frame.size.width / 2) - 2;
@ -932,11 +939,14 @@
{
// Draw the well bezel
[self drawSwitchBezel: rect
forState: state];
forState: state
enabled: enabled];
// Draw the knob
[self drawSwitchKnob: rect
forState: state];
forState: state
enabled: enabled];
}
// NSSegmentedControl drawing methods