tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2025-01-04 17:18:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix clippy errors on macOS (#7064)

Browse Source 
* fix clippy errors on macOS

* cargo clippy --fix
This commit is contained in:
chip 2023-05-26 09:24:23 +02:00 committed by GitHub
parent a28fdf7ec7
commit 160489454d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/tauri-utils/src/config.rs
View File

@ -748,7 +748,7 @@ pub struct BundleConfig {
}
/// a tuple struct of RGBA colors. Each value has minimum of 0 and maximum of 255.
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize, Default)]
#[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize, Default)]
#[cfg_attr(feature = "schema", derive(JsonSchema))]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct Color(pub u8, pub u8, pub u8, pub u8);

23
core/tauri/src/vibrancy/macos.rs
View File

@ -63,9 +63,11 @@ pub fn apply_effects(window: id, effects: WindowEffectsConfig) {
return;
}
if appearance as u32 > 9 && NSAppKitVersionNumber < NSAppKitVersionNumber10_14 {
if appearance as u32 > 4 && NSAppKitVersionNumber < NSAppKitVersionNumber10_11 {
appearance = NSVisualEffectMaterial::AppearanceBased;
} else if appearance as u32 > 4 && NSAppKitVersionNumber < NSAppKitVersionNumber10_11 {
}
if appearance as u32 > 9 && NSAppKitVersionNumber < NSAppKitVersionNumber10_14 {
appearance = NSVisualEffectMaterial::AppearanceBased;
}
@ -201,20 +203,17 @@ impl NSVisualEffectView for id {
/// <https://developer.apple.com/documentation/appkit/nsvisualeffectview/material>
#[repr(u64)]
#[derive(Clone, Copy, Debug, PartialEq)]
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum NSVisualEffectMaterial {
#[deprecated(
since = "macOS 10.14",
note = "A default material appropriate for the view's effectiveAppearance. You should instead choose an appropriate semantic material."
)]
#[deprecated = "Since macOS 10.14 a default material appropriate for the view's effectiveAppearance. You should instead choose an appropriate semantic material."]
AppearanceBased = 0,
#[deprecated(since = "macOS 10.14", note = "Use a semantic material instead.")]
#[deprecated = "Since macOS 10.14 use a semantic material instead."]
Light = 1,
#[deprecated(since = "macOS 10.14", note = "Use a semantic material instead.")]
#[deprecated = "Since macOS 10.14 use a semantic material instead."]
Dark = 2,
#[deprecated(since = "macOS 10.14", note = "Use a semantic material instead.")]
#[deprecated = "Since macOS 10.14 use a semantic material instead."]
MediumLight = 8,
#[deprecated(since = "macOS 10.14", note = "Use a semantic material instead.")]
#[deprecated = "Since macOS 10.14 use a semantic material instead."]
UltraDark = 9,
/// macOS 10.10+
@ -252,7 +251,7 @@ pub enum NSVisualEffectMaterial {
/// <https://developer.apple.com/documentation/appkit/nsvisualeffectview/state>
#[allow(dead_code)]
#[repr(u64)]
#[derive(Clone, Copy, Debug, PartialEq)]
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum NSVisualEffectState {
/// Make window vibrancy state follow the window's active state
FollowsWindowActiveState = 0,