Skip to content

Fixes for colors and icon opaque #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nark merged 6 commits into from
Apr 26, 2020
Merged

Fixes for colors and icon opaque #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f0b899
Merge pull request #1 from nark/master
ProfDrLuigi Apr 25, 2020
257e677
Fixed white text bug when user goes idling
Apr 25, 2020
4ecc7c6
Fixed that the black nick text in light mode automatically change in …
Apr 25, 2020
e5fb442
Fixed Purple and Blue color in Darkmode (brighter)
Apr 25, 2020
17f248b
In dark mode the opaque value for the user avatar is now correct "tin…
Apr 26, 2020
0b87864
Adjust Status Text color. In light mode a bit darker and in dark mode…
Apr 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Sources/WCChatController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2609,10 +2609,10 @@ - (NSView *)tableView:(NSTableView *)tableView
} break;
}

if(row != [tableView selectedRow])
//if(row != [tableView selectedRow])
cellView.nickTextField.textColor = [WCUser colorForColor:[user color] idleTint:[user isIdle]];
else
cellView.nickTextField.textColor = [NSColor whiteColor];
//else
// cellView.nickTextField.textColor = [NSColor whiteColor];

[cellView.nickTextField setAllowsEditingTextAttributes:YES];

Expand All @@ -2632,11 +2632,17 @@ - (NSView *)tableView:(NSTableView *)tableView

cellView.nickTextField.attributedStringValue = [NSAttributedString attributedStringWithString:[user nick]
attributes:attributes];

cellView.nickTextField.toolTip = [user nick];

cellView.statusTextField.toolTip = [user status];
cellView.statusTextField.stringValue = [user status];

NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
if (osxMode == nil) {
cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:153.0/255.0 green:153.0/255.0 blue:153.0/255.0 alpha:1.0]; //Light mode
} else {
cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:197.0/255.0 green:197.0/255.0 blue:197.0/255.0 alpha:1.0]; //Dark mode
}

cellView.imageView.image = [user iconWithIdleTint:YES];

return cellView;
Expand Down
35 changes: 28 additions & 7 deletions Sources/WCUser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,17 @@ @implementation WCUser

+ (NSColor *)colorForColor:(WCAccountColor)color idleTint:(BOOL)idleTint {
NSColor *value;


NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];

switch(color) {
case WCAccountColorBlack:
default:
value = [NSColor colorWithCalibratedHue:0.0 saturation:0.0 brightness:0.0 alpha:1.0];
if (osxMode == nil) {
value = [NSColor colorWithCalibratedHue:0.0 saturation:0.0 brightness:0.0 alpha:1.0]; //Light mode
} else {
value = [NSColor colorWithCalibratedHue:0.0 saturation:0.0 brightness:1.0 alpha:1.0]; //Dark mode
}
break;

case WCAccountColorRed:
Expand All @@ -116,11 +122,19 @@ + (NSColor *)colorForColor:(WCAccountColor)color idleTint:(BOOL)idleTint {
break;

case WCAccountColorBlue:
value = [NSColor blueColor];
if (osxMode == nil) {
value = [NSColor blueColor]; //Light mode
} else {
value = [NSColor colorWithCalibratedRed:0.5 green:0.5 blue:1.0 alpha:1.0]; //Dark mode
}
break;

case WCAccountColorPurple:
value = [NSColor purpleColor];
if (osxMode == nil) {
value = [NSColor purpleColor]; //Light mode
} else {
value = [NSColor colorWithCalibratedRed:248.0/255.0 green:91.0/255 blue:228.0/255.0 alpha:1.0]; //Dark mode
}
break;
}

Expand Down Expand Up @@ -257,9 +271,16 @@ - (NSImage *)icon {


- (NSImage *)iconWithIdleTint:(BOOL)value {
return _idle && value
? [_icon tintedImageWithColor:[NSColor colorWithDeviceWhite:1.0 alpha:0.5]]
: _icon;
NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
if (osxMode == nil) {
return _idle && value
? [_icon tintedImageWithColor:[NSColor colorWithDeviceWhite:1.0 alpha:0.5]]
: _icon; //Light mode
} else {
return _idle && value
? [_icon tintedImageWithColor:[NSColor colorWithDeviceWhite:0.0 alpha:0.5]]
: _icon; //Dark mode
}
}


Expand Down