Skip to content

Commit 80316b0

Browse files
tweak(ui): left-hand panel buttons
1 parent 395d35c commit 80316b0

File tree

1 file changed

+27
-13
lines changed

1 file changed

+27
-13
lines changed

invokeai/frontend/web/src/features/ui/components/FloatingParametersPanelButtons.tsx

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { useAppSelector } from 'app/store/storeHooks';
33
import { ToolChooser } from 'features/controlLayers/components/Tool/ToolChooser';
44
import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
55
import { useImageViewer } from 'features/gallery/components/ImageViewer/useImageViewer';
6-
import CancelCurrentQueueItemIconButton from 'features/queue/components/CancelCurrentQueueItemIconButton';
76
import { useClearQueue } from 'features/queue/components/ClearQueueConfirmationAlertDialog';
87
import { QueueButtonTooltip } from 'features/queue/components/QueueButtonTooltip';
8+
import { useCancelCurrentQueueItem } from 'features/queue/hooks/useCancelCurrentQueueItem';
99
import { useInvoke } from 'features/queue/hooks/useInvoke';
1010
import type { UsePanelReturn } from 'features/ui/hooks/usePanel';
1111
import { selectActiveTab } from 'features/ui/store/uiSelectors';
@@ -17,6 +17,7 @@ import {
1717
PiSlidersHorizontalBold,
1818
PiSparkleFill,
1919
PiTrashSimpleBold,
20+
PiXBold,
2021
} from 'react-icons/pi';
2122
import { useGetQueueStatusQuery } from 'services/api/endpoints/queue';
2223

@@ -32,6 +33,7 @@ const FloatingSidePanelButtons = (props: Props) => {
3233
const imageViewer = useImageViewer();
3334
const clearQueue = useClearQueue();
3435
const { data: queueStatus } = useGetQueueStatusQuery();
36+
const cancelCurrent = useCancelCurrentQueueItem();
3537

3638
const queueButtonIcon = useMemo(() => {
3739
const isProcessing = (queueStatus?.queue.in_progress ?? 0) > 0;
@@ -51,12 +53,13 @@ const FloatingSidePanelButtons = (props: Props) => {
5153
<ToolChooser />
5254
</CanvasManagerProviderGate>
5355
)}
54-
<ButtonGroup orientation="vertical">
56+
<ButtonGroup orientation="vertical" h={48}>
5557
<IconButton
5658
tooltip={t('accessibility.showOptionsPanel')}
5759
aria-label={t('accessibility.showOptionsPanel')}
5860
onClick={props.panelApi.toggle}
5961
icon={<PiSlidersHorizontalBold />}
62+
flexGrow={1}
6063
/>
6164
<QueueButtonTooltip prepend={shift}>
6265
<IconButton
@@ -66,20 +69,31 @@ const FloatingSidePanelButtons = (props: Props) => {
6669
isDisabled={queue.isDisabled}
6770
icon={queueButtonIcon}
6871
colorScheme="invokeYellow"
72+
flexGrow={1}
6973
/>
7074
</QueueButtonTooltip>
71-
<CancelCurrentQueueItemIconButton />
75+
<IconButton
76+
isDisabled={cancelCurrent.isDisabled}
77+
isLoading={cancelCurrent.isLoading}
78+
aria-label={t('queue.cancel')}
79+
tooltip={t('queue.cancelTooltip')}
80+
icon={<PiXBold />}
81+
onClick={cancelCurrent.cancelQueueItem}
82+
colorScheme="error"
83+
flexGrow={1}
84+
/>
85+
<IconButton
86+
isDisabled={clearQueue.isDisabled}
87+
isLoading={clearQueue.isLoading}
88+
aria-label={t('queue.clear')}
89+
tooltip={t('queue.clearTooltip')}
90+
icon={<PiTrashSimpleBold />}
91+
colorScheme="error"
92+
onClick={clearQueue.openDialog}
93+
data-testid={t('queue.clear')}
94+
flexGrow={1}
95+
/>
7296
</ButtonGroup>
73-
<IconButton
74-
isDisabled={clearQueue.isDisabled}
75-
isLoading={clearQueue.isLoading}
76-
aria-label={t('queue.clear')}
77-
tooltip={t('queue.clearTooltip')}
78-
icon={<PiTrashSimpleBold />}
79-
colorScheme="error"
80-
onClick={clearQueue.openDialog}
81-
data-testid={t('queue.clear')}
82-
/>
8397
</Flex>
8498
);
8599
};

0 commit comments

Comments
 (0)