Skip to content

Commit 9b73028

Browse files
committed
disable analytics panel in masks when adjustments panel is visible
1 parent 15d1347 commit 9b73028

15 files changed

Lines changed: 83 additions & 97 deletions

File tree

src/components/panel/right/MasksPanel.tsx

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ import {
7676
ADJUSTMENT_SECTIONS,
7777
} from '../../../utils/adjustments';
7878
import { useContextMenu } from '../../../context/ContextMenuContext';
79-
import { OPTION_SEPARATOR, Orientation } from '../../ui/AppProperties';
79+
import { OPTION_SEPARATOR, Orientation, Panel } from '../../ui/AppProperties';
8080
import { createSubMask } from '../../../utils/maskUtils';
8181
import { usePresets } from '../../../hooks/usePresets';
8282
import Text from '../../ui/Text';
@@ -251,7 +251,23 @@ export default function MasksPanel() {
251251
const { t } = useTranslation();
252252
const { setAdjustments } = useEditorActions();
253253
const { handleGenerateAiDepthMask, handleGenerateAiForegroundMask, handleGenerateAiSkyMask } = useAiMasking();
254-
const setCustomEscapeHandler = useUIStore((s) => s.setCustomEscapeHandler);
254+
const { setCustomEscapeHandler, isAdjustmentsPanelVisible } = useUIStore(
255+
useShallow((state) => {
256+
const leftVisible = state.uiVisibility.leftPanel;
257+
const rightVisible = state.uiVisibility.rightPanel;
258+
259+
const isVisible =
260+
(leftVisible && state.activePanels.leftTop === Panel.Adjustments) ||
261+
(leftVisible && state.activePanels.leftBottom === Panel.Adjustments) ||
262+
(rightVisible && state.activePanels.rightTop === Panel.Adjustments) ||
263+
(rightVisible && state.activePanels.rightBottom === Panel.Adjustments);
264+
265+
return {
266+
setCustomEscapeHandler: state.setCustomEscapeHandler,
267+
isAdjustmentsPanelVisible: isVisible,
268+
};
269+
}),
270+
);
255271
const { appSettings } = useSettingsStore(
256272
useShallow((state) => ({
257273
appSettings: state.appSettings,
@@ -969,10 +985,19 @@ export default function MasksPanel() {
969985
<button
970986
className={clsx(
971987
'p-2 rounded-full transition-colors',
972-
isWaveformVisible ? 'bg-surface hover:bg-card-active' : 'hover:bg-surface',
988+
isAdjustmentsPanelVisible
989+
? 'opacity-50 cursor-not-allowed text-text-secondary'
990+
: isWaveformVisible
991+
? 'bg-surface hover:bg-card-active'
992+
: 'hover:bg-surface',
973993
)}
974994
onClick={onToggleWaveform}
975-
data-tooltip={t('editor.masks.toggleAnalyticsTooltip')}
995+
disabled={isAdjustmentsPanelVisible}
996+
data-tooltip={
997+
isAdjustmentsPanelVisible
998+
? t('editor.masks.toggleAnalyticsInAdjustments')
999+
: t('editor.masks.toggleAnalyticsTooltip')
1000+
}
9761001
>
9771002
<ChartArea size={18} />
9781003
</button>
@@ -987,7 +1012,7 @@ export default function MasksPanel() {
9871012
</div>
9881013

9891014
<AnimatePresence initial={false}>
990-
{isWaveformVisible && (
1015+
{isWaveformVisible && !isAdjustmentsPanelVisible && (
9911016
<motion.div
9921017
initial={{ height: 0, opacity: 0 }}
9931018
animate={{ height: waveformHeight || 256, opacity: 1 }}

src/i18n/locales/ca.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@
600600
"select": "Seleccionar",
601601
"selectPresetTooltip": "Seleccioneu un ajust preestablert per aplicar"
602602
},
603+
"toggleAnalyticsInAdjustments": "Commutar l'anàlisi al panell d'ajustos",
603604
"toggleAnalyticsTooltip": "Alternar visualització d'anàlisi",
604605
"tooltips": {
605606
"addToCurrent": "Afegir {{name}} a la màscara actual o crear-ne una de nova (Clic dret)",

src/i18n/locales/de.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@
600600
"select": "Auswählen",
601601
"selectPresetTooltip": "Eine Vorgabe zum Anwenden auswählen"
602602
},
603+
"toggleAnalyticsInAdjustments": "Analyseanzeige im Anpassungen-Panel umschalten",
603604
"toggleAnalyticsTooltip": "Analyseanzeige umschalten",
604605
"tooltips": {
605606
"addToCurrent": "{{name}} zur aktuellen Maske hinzufügen oder neu erstellen (Rechtsklick)",

src/i18n/locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@
600600
"select": "Select",
601601
"selectPresetTooltip": "Select a preset to apply"
602602
},
603+
"toggleAnalyticsInAdjustments": "Toggle analytics in Adjustments panel",
603604
"toggleAnalyticsTooltip": "Toggle Analytics Display",
604605
"tooltips": {
605606
"addToCurrent": "Add {{name}} to Current Mask or Create New (Right-click)",

src/i18n/locales/es.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@
621621
"select": "Seleccionar",
622622
"selectPresetTooltip": "Selecciona un ajuste preestablecido para aplicar"
623623
},
624+
"toggleAnalyticsInAdjustments": "Alternar análisis en el panel de Ajustes",
624625
"toggleAnalyticsTooltip": "Alternar vista de análisis",
625626
"tooltips": {
626627
"addToCurrent": "Añadir {{name}} a la máscara actual o crear nueva (Clic derecho)",

src/i18n/locales/fr.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@
621621
"select": "Sélectionner",
622622
"selectPresetTooltip": "Sélectionner un paramètre prédéfini à appliquer"
623623
},
624+
"toggleAnalyticsInAdjustments": "Afficher/Masquer l'analyse dans le panneau Réglages",
624625
"toggleAnalyticsTooltip": "Basculer l'affichage des analyses",
625626
"tooltips": {
626627
"addToCurrent": "Ajouter {{name}} au masque actuel ou en créer un nouveau (Clic-droit)",

src/i18n/locales/it.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@
621621
"select": "Seleziona",
622622
"selectPresetTooltip": "Seleziona un predefinito da applicare"
623623
},
624+
"toggleAnalyticsInAdjustments": "Mostra/Nascondi analisi nel pannello Regolazioni",
624625
"toggleAnalyticsTooltip": "Attiva/Disattiva Visualizzazione Analitiche",
625626
"tooltips": {
626627
"addToCurrent": "Aggiungi {{name}} alla Maschera Attuale o Crea Nuova (Tasto Destro)",

src/i18n/locales/ja.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@
598598
"select": "選択",
599599
"selectPresetTooltip": "適用するプリセットを選択"
600600
},
601+
"toggleAnalyticsInAdjustments": "調整パネルでアナリティクスを切り替える",
601602
"toggleAnalyticsTooltip": "アナリティクス表示の切り替え",
602603
"tooltips": {
603604
"addToCurrent": "{{name}}を現在のマスクに追加、または新規作成 (右クリック)",

src/i18n/locales/ko.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@
598598
"select": "선택",
599599
"selectPresetTooltip": "적용할 프리셋 선택"
600600
},
601+
"toggleAnalyticsInAdjustments": "조정 패널에서 분석 토글",
601602
"toggleAnalyticsTooltip": "분석 표시 전환",
602603
"tooltips": {
603604
"addToCurrent": "{{name}}을(를) 현재 마스크에 추가하거나 새로 만들기 (우클릭)",

src/i18n/locales/pl.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@
642642
"select": "Wybierz",
643643
"selectPresetTooltip": "Wybierz preset do zastosowania"
644644
},
645+
"toggleAnalyticsInAdjustments": "Przełącz analizę w panelu Dopasowania",
645646
"toggleAnalyticsTooltip": "Przełącz widok analityki",
646647
"tooltips": {
647648
"addToCurrent": "Dodaj {{name}} do bieżącej maski lub utwórz nową (Prawy przycisk)",

0 commit comments

Comments
 (0)