Mercurial > dwindows
comparison mac/dw.m @ 2100:12a9546c3e03
Mac: Fix returning the correct value on query after Windows changes.
Mac: Also fix some Xcode warnings regarding Mojave 10.14.
Win: Fix a minor typo in the last commit
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 12 Jun 2020 20:55:01 +0000 |
parents | 296a3872ddd9 |
children | 07666f97412f |
comparison
equal
deleted
inserted
replaced
2099:296a3872ddd9 | 2100:12a9546c3e03 |
---|---|
12627 case DW_FEATURE_MLE_AUTO_COMPLETE: | 12627 case DW_FEATURE_MLE_AUTO_COMPLETE: |
12628 return DW_FEATURE_ENABLED; | 12628 return DW_FEATURE_ENABLED; |
12629 #ifdef BUILDING_FOR_MOJAVE | 12629 #ifdef BUILDING_FOR_MOJAVE |
12630 case DW_FEATURE_DARK_MODE: | 12630 case DW_FEATURE_DARK_MODE: |
12631 { | 12631 { |
12632 NSAppearance *appearance = [DWApp appearance]; | 12632 if(@available(macOS 10.14, *)) |
12633 | |
12634 if(appearance) | |
12635 { | 12633 { |
12636 NSAppearanceName basicAppearance = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; | 12634 NSAppearance *appearance = [DWApp appearance]; |
12637 | 12635 |
12638 if([basicAppearance isEqualToString:NSAppearanceNameDarkAqua]) | 12636 if(appearance) |
12639 return 2; | 12637 { |
12640 if([basicAppearance isEqualToString:NSAppearanceNameAqua]) | 12638 NSAppearanceName basicAppearance = [appearance bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; |
12641 return DW_FEATURE_DISABLED; | 12639 |
12640 if([basicAppearance isEqualToString:NSAppearanceNameDarkAqua]) | |
12641 return 3; | |
12642 if([basicAppearance isEqualToString:NSAppearanceNameAqua]) | |
12643 return DW_FEATURE_DISABLED; | |
12644 } | |
12642 } | 12645 } |
12643 return DW_FEATURE_ENABLED; | 12646 return DW_FEATURE_ENABLED; |
12644 } | 12647 } |
12645 #endif | 12648 #endif |
12646 default: | 12649 default: |
12685 /* Enabled lets the OS decide the mode */ | 12688 /* Enabled lets the OS decide the mode */ |
12686 else if(state == DW_FEATURE_ENABLED || state == 2) | 12689 else if(state == DW_FEATURE_ENABLED || state == 2) |
12687 [DWApp setAppearance:nil]; | 12690 [DWApp setAppearance:nil]; |
12688 /* 2 forces dark mode aqua appearance */ | 12691 /* 2 forces dark mode aqua appearance */ |
12689 else if(state == 3) | 12692 else if(state == 3) |
12690 [DWApp setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; | 12693 { |
12694 if(@available(macOS 10.14, *)) | |
12695 [DWApp setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameDarkAqua]]; | |
12696 } | |
12691 else | 12697 else |
12692 return DW_ERROR_GENERAL; | 12698 return DW_ERROR_GENERAL; |
12693 return DW_ERROR_NONE; | 12699 return DW_ERROR_NONE; |
12694 } | 12700 } |
12695 #endif | 12701 #endif |