From 8755f849dd7c7a3e2f0222fd081b0045f4203717 Mon Sep 17 00:00:00 2001 From: Robin Davies Date: Sat, 12 Oct 2024 05:33:45 -0400 Subject: [PATCH] Snapshot button select, and text scaling. --- react/src/MaterialColors.tsx | 4 ++-- react/src/SnapshotButton.tsx | 39 +++++++++++++++++++++++++++++++----- react/src/SnapshotPanel.tsx | 2 -- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/react/src/MaterialColors.tsx b/react/src/MaterialColors.tsx index bd1d4c0..7342d4b 100644 --- a/react/src/MaterialColors.tsx +++ b/react/src/MaterialColors.tsx @@ -342,9 +342,9 @@ export function getBorderColor(colorKey: string): string { if (darkMode) { if (colorKey === "grey" || colorKey === "yellow") { - return list[700]; + return list[300]; } - return list[500]; + return list[200]; } else { if (colorKey === "grey") { diff --git a/react/src/SnapshotButton.tsx b/react/src/SnapshotButton.tsx index 1feafb4..2348450 100644 --- a/react/src/SnapshotButton.tsx +++ b/react/src/SnapshotButton.tsx @@ -31,6 +31,7 @@ import SaveIconOutline from '@mui/icons-material/Save'; import Button from "@mui/material/Button"; import EditIconOutline from '@mui/icons-material/Edit'; import { Snapshot } from './Pedalboard'; +import { isDarkMode } from './DarkMode'; import { colorKeys, getBackgroundColor, getBorderColor } from './MaterialColors'; import { PiPedalModel, PiPedalModelFactory, SnapshotModifiedEvent } from './PiPedalModel'; @@ -49,6 +50,7 @@ export interface SnapshotButtonProps { export interface SnapshotButtonState { modified: boolean; + uiScale: number; }; export default class SnapshotButton extends ResizeResponsiveComponent { @@ -58,14 +60,33 @@ export default class SnapshotButton extends ResizeResponsiveComponent 4) uiScale = 4; + this.setState({uiScale: uiScale}); } onSnapshotModified(event: SnapshotModifiedEvent) { @@ -95,7 +116,7 @@ export default class SnapshotButton extends ResizeResponsiveComponent @@ -130,6 +153,12 @@ export default class SnapshotButton extends ResizeResponsiveComponent { if (snapshot) this.props.onSelectSnapshot(snapshotIndex); }} > + {/* select background mask*/} +
{ @@ -144,13 +173,13 @@ export default class SnapshotButton extends ResizeResponsiveComponent {title}
{(snapshotIndex + 1).toString()} @@ -188,7 +217,7 @@ export default class SnapshotButton extends ResizeResponsiveComponent -
 
+
{ ev.stopPropagation(); /*don't prop to card*/ }} onClick={() => { this.props.onSaveSnapshot(snapshotIndex); }} diff --git a/react/src/SnapshotPanel.tsx b/react/src/SnapshotPanel.tsx index f1316f4..67943ab 100644 --- a/react/src/SnapshotPanel.tsx +++ b/react/src/SnapshotPanel.tsx @@ -236,7 +236,6 @@ export default class SnapshotPanel extends ResizeResponsiveComponent