mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 09:26:43 +00:00
Merge branch 'feat/layers-panel-photoshop-options' into codex/fill-mask-preview-20261012
# Conflicts: # crates/engine/src/jobs.rs # crates/ui-egui/src/i18n/hu.tsv # crates/ui-egui/src/i18n/sr.tsv # crates/ui-egui/src/i18n/tr.tsv # crates/ui-egui/src/i18n/vi.tsv
This commit is contained in:
commit
80dcc22a70
5 files changed
+1
-20
No files matched your search
@@ -713,17 +713,7 @@ impl Session {
|
||||
return Ok(Started::Done(v));
|
||||
}
|
||||
// Pixel commands follow the Channels panel target unless the caller names one.
|
||||
let run_params = crate::channel_cmds::inject_target(self, id, crate::commands::inject_kind(id, params.clone()));
|
||||
if let Err(why) = self.explicit_layer_enabled(spec, ¶ms).unwrap_or_else(|| self.precondition(spec, &run_params)) {
|
||||
return Err(EngineError::Disabled(id.to_string(), why));
|
||||
}
|
||||
if let Some(why) = self.job_conflict(id, spec.journal) {
|
||||
return Err(EngineError::Disabled(id.to_string(), why));
|
||||
}
|
||||
// Painting on or moving a hidden layer is refused, as in Photoshop (#571).
|
||||
if let Some(why) = crate::hidden_target::refusal(self, id, ¶ms) {
|
||||
return Err(EngineError::Other(why.into()));
|
||||
}
|
||||
let run_params = self.admit(id, spec, ¶ms)?;
|
||||
// This UI-only disclosure preference applies to both `execute` and `start`:
|
||||
// desktop UI normally calls `start`, even for synchronous Layer Style commands.
|
||||
let new_fx_target = if id.starts_with("layer.layerStyle.") {
|
||||
@@ -735,7 +725,6 @@ impl Session {
|
||||
None
|
||||
};
|
||||
let expand_new_fx = crate::commands::layer_panel_option(self, "expandNewEffects", true);
|
||||
let run_params = self.admit(id, spec, ¶ms)?;
|
||||
self.coalesce_request = params.get("coalesce").and_then(Value::as_str).map(str::to_string);
|
||||
self.color_restrict = crate::channel_cmds::color_restriction(self, id, &run_params);
|
||||
self.jobs.spawn = background;
|
||||
|
||||
@@ -4124,8 +4124,6 @@ cameraRaw Yellow Sárga
|
||||
Show layer mask badges Rétegmaszk-jelvények megjelenítése
|
||||
Thumbnail Contents Bélyegkép tartalma
|
||||
Thumbnail Size Bélyegképméret
|
||||
|
||||
# Layers panel options and Smart Filter editors
|
||||
Use Default Masks on Fill Layers Alapértelmezett maszkok kitöltőrétegeken
|
||||
Accept and Go to Conflict Elfogadás és ugrás az ütközéshez
|
||||
Changes undone. Változások visszavonva.
|
||||
|
||||
|
Can't render this file because it contains an unexpected character in line 6 and column 47.
|
@@ -4278,8 +4278,6 @@ shape Appearance Izgled
|
||||
Show layer mask badges Prikaži oznake maske sloja
|
||||
Thumbnail Contents Sadržaj sličice
|
||||
Thumbnail Size Veličina sličice
|
||||
|
||||
# Fill layers
|
||||
Use Default Masks on Fill Layers Koristi podrazumevane maske na slojevima popune
|
||||
Accept and Go to Conflict Prihvati i idi na sukob
|
||||
Changes undone. Izmene su poništene.
|
||||
|
||||
|
Can't render this file because it contains an unexpected character in line 6 and column 47.
|
@@ -3935,8 +3935,6 @@ cameraData Lens Lens
|
||||
Show layer mask badges Katman maskesi rozetlerini göster
|
||||
Thumbnail Contents Küçük Resim İçeriği
|
||||
Thumbnail Size Küçük Resim Boyutu
|
||||
|
||||
# Layers panel options and Smart Filter editors
|
||||
Use Default Masks on Fill Layers Dolgu Katmanlarında Varsayılan Maskeleri Kullan
|
||||
Accept and Go to Conflict Kabul Et ve Çakışmaya Git
|
||||
Changes undone. Değişiklikler geri alındı.
|
||||
|
||||
|
Can't render this file because it contains an unexpected character in line 8 and column 34.
|
@@ -3692,8 +3692,6 @@ curves Smooth Làm mượt
|
||||
Show layer mask badges Hiện huy hiệu mặt nạ lớp
|
||||
Thumbnail Contents Nội dung hình thu nhỏ
|
||||
Thumbnail Size Kích thước hình thu nhỏ
|
||||
|
||||
# Layers panel options and Smart Filter editors
|
||||
Use Default Masks on Fill Layers Dùng mặt nạ mặc định cho lớp tô
|
||||
Accept and Go to Conflict Chấp nhận và đến xung đột
|
||||
Changes undone. Đã hoàn tác thay đổi.
|
||||
|
||||
|
Can't render this file because it contains an unexpected character in line 6 and column 47.
|
Reference in new issue
Block a user