Skip to content

feat(adjustments): visibility toggles for every adjustment tool #1833

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

Open
lalibertemarc wants to merge 3 commits into
base: main
Choose a base branch
from
+891 −749
Open

feat(adjustments): visibility toggles for every adjustment tool #1833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
293ac0b
refactor(ui): extract the section visibility toggle
lalibertemarc Oct 9, 2026
057d83d
feat(adjustments): add a visibility toggle to every adjustment tool
lalibertemarc Oct 9, 2026
eba61ed
refactor(adjustments): share the adjustment tool lookup
lalibertemarc Oct 9, 2026
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
26 changes: 8 additions & 18 deletions src-tauri/src/cache_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,8 @@ pub fn calculate_patched_warped_hash(adjustments: &serde_json::Value) -> u64 {
pub fn calculate_effects_hash(adjustments: &serde_json::Value) -> u64 {
let mut hasher = DefaultHasher::new();

let effects_visible = adjustments
.get("sectionVisibility")
.and_then(|v| v.get("effects"))
.and_then(|s| s.as_bool())
.unwrap_or(true);

let blur_enabled = effects_visible && adjustments["lensBlurEnabled"].as_bool().unwrap_or(false);
let blur_enabled =
crate::image_processing::is_effect_enabled(adjustments, "lensBlur", "lensBlurEnabled");
blur_enabled.hash(&mut hasher);

if blur_enabled {
Expand All @@ -198,7 +193,7 @@ pub fn calculate_effects_hash(adjustments: &serde_json::Value) -> u64 {
}

let relight_enabled =
effects_visible && adjustments["relightEnabled"].as_bool().unwrap_or(false);
crate::image_processing::is_effect_enabled(adjustments, "relight", "relightEnabled");
relight_enabled.hash(&mut hasher);

if relight_enabled {
Expand All @@ -217,7 +212,7 @@ pub fn calculate_effects_hash(adjustments: &serde_json::Value) -> u64 {
);
}

let fog_enabled = effects_visible && adjustments["fogEnabled"].as_bool().unwrap_or(false);
let fog_enabled = crate::image_processing::is_effect_enabled(adjustments, "fog", "fogEnabled");
fog_enabled.hash(&mut hasher);

if fog_enabled {
Expand Down Expand Up @@ -293,13 +288,8 @@ pub fn calculate_transform_hash(adjustments: &serde_json::Value) -> u64 {
let flip_v = adjustments["flipVertical"].as_bool().unwrap_or(false);
flip_v.hash(&mut hasher);

let effects_visible = adjustments
.get("sectionVisibility")
.and_then(|v| v.get("effects"))
.and_then(|s| s.as_bool())
.unwrap_or(true);

let blur_enabled = effects_visible && adjustments["lensBlurEnabled"].as_bool().unwrap_or(false);
let blur_enabled =
crate::image_processing::is_effect_enabled(adjustments, "lensBlur", "lensBlurEnabled");
blur_enabled.hash(&mut hasher);
if blur_enabled {
if let Some(val) = adjustments.get("lensBlurAmount") {
Expand Down Expand Up @@ -329,7 +319,7 @@ pub fn calculate_transform_hash(adjustments: &serde_json::Value) -> u64 {
}

let relight_enabled =
effects_visible && adjustments["relightEnabled"].as_bool().unwrap_or(false);
crate::image_processing::is_effect_enabled(adjustments, "relight", "relightEnabled");
relight_enabled.hash(&mut hasher);
if relight_enabled {
for key in [
Expand All @@ -349,7 +339,7 @@ pub fn calculate_transform_hash(adjustments: &serde_json::Value) -> u64 {
}
}

let fog_enabled = effects_visible && adjustments["fogEnabled"].as_bool().unwrap_or(false);
let fog_enabled = crate::image_processing::is_effect_enabled(adjustments, "fog", "fogEnabled");
fog_enabled.hash(&mut hasher);
if fog_enabled {
for key in [
Expand Down
21 changes: 10 additions & 11 deletions src-tauri/src/file_management.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2959,23 +2959,22 @@ pub async fn apply_auto_adjustments_to_paths(
existing_metadata.adjustments = serde_json::json!({});
}

let mut active_tools =
crate::image_processing::active_tools(&existing_metadata.adjustments);

if let (Some(existing_map), Some(auto_map)) = (
existing_metadata.adjustments.as_object_mut(),
auto_adjustments_json.as_object(),
) {
for (k, v) in auto_map {
if k == "sectionVisibility" {
if let Some(existing_vis_val) = existing_map.get_mut(k) {
if let (Some(existing_vis), Some(auto_vis)) =
(existing_vis_val.as_object_mut(), v.as_object())
{
for (vis_k, vis_v) in auto_vis {
existing_vis.insert(vis_k.clone(), vis_v.clone());
}
}
} else {
existing_map.insert(k.clone(), v.clone());
if k == "activeTools" {
if let Some(auto_tools) = v.as_object() {
active_tools.extend(auto_tools.clone());
}
existing_map.insert(
k.clone(),
serde_json::Value::Object(std::mem::take(&mut active_tools)),
);
} else {
existing_map.insert(k.clone(), v.clone());
}
Expand Down
8 changes: 1 addition & 7 deletions src-tauri/src/fog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,7 @@ pub fn apply_fog<'a>(
image: Cow<'a, DynamicImage>,
adjustments: &serde_json::Value,
) -> Cow<'a, DynamicImage> {
let effects_visible = adjustments
.get("sectionVisibility")
.and_then(|v| v.get("effects"))
.and_then(|s| s.as_bool())
.unwrap_or(true);

if !adjustments["fogEnabled"].as_bool().unwrap_or(false) || !effects_visible {
if !crate::image_processing::is_effect_enabled(adjustments, "fog", "fogEnabled") {
return image;
}

Expand Down
Loading
Loading