mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 01:30:05 +00:00 
			
		
		
		
	Fix palette settings equality check, add active and inactive alert colors
This commit is contained in:
		
							parent
							
								
									543324ba83
								
							
						
					
					
						commit
						949c983a01
					
				
					 1 changed files with 3 additions and 1 deletions
				
			
		|  | @ -208,7 +208,9 @@ PaletteSettings& PaletteSettings::Instance() | ||||||
| 
 | 
 | ||||||
| bool operator==(const PaletteSettings& lhs, const PaletteSettings& rhs) | bool operator==(const PaletteSettings& lhs, const PaletteSettings& rhs) | ||||||
| { | { | ||||||
|    return lhs.p->palette_ == rhs.p->palette_; |    return (lhs.p->palette_ == rhs.p->palette_ && | ||||||
|  |            lhs.p->activeAlertColor_ == rhs.p->activeAlertColor_ && | ||||||
|  |            lhs.p->inactiveAlertColor_ == rhs.p->inactiveAlertColor_); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| } // namespace settings
 | } // namespace settings
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat