github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-02-16 19:45:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): global canvas hotkey interaction restrictions

Browse Source
This commit is contained in:
psychedelicious
2024-09-13 19:09:19 +10:00
parent 3aaaae4d1c
commit 73ea5cb42a
5 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/frontend/web/src/features/controlLayers/components/CanvasMainPanelContent.tsx
View File

@@ -48,7 +48,9 @@ export const CanvasMainPanelContent = memo(() => {
alignItems="center"
justifyContent="center"
>
<CanvasToolbar />
<CanvasManagerProviderGate>
<CanvasToolbar />
</CanvasManagerProviderGate>
<ContextMenu<HTMLDivElement> renderMenu={renderMenu}>
{(ref) => (
<Flex

29
invokeai/frontend/web/src/features/controlLayers/components/Toolbar/CanvasToolbar.tsx
View File

@@ -8,7 +8,6 @@ import { CanvasToolbarFitBboxToLayersButton } from 'features/controlLayers/compo
import { CanvasToolbarResetViewButton } from 'features/controlLayers/components/Toolbar/CanvasToolbarResetViewButton';
import { CanvasToolbarSaveToGalleryButton } from 'features/controlLayers/components/Toolbar/CanvasToolbarSaveToGalleryButton';
import { CanvasToolbarScale } from 'features/controlLayers/components/Toolbar/CanvasToolbarScale';
import { CanvasManagerProviderGate } from 'features/controlLayers/contexts/CanvasManagerProviderGate';
import { useCanvasDeleteLayerHotkey } from 'features/controlLayers/hooks/useCanvasDeleteLayerHotkey';
import { useCanvasEntityQuickSwitchHotkey } from 'features/controlLayers/hooks/useCanvasEntityQuickSwitchHotkey';
import { useCanvasResetLayerHotkey } from 'features/controlLayers/hooks/useCanvasResetLayerHotkey';
@@ -24,21 +23,19 @@ export const CanvasToolbar = memo(() => {
useNextPrevEntityHotkeys();
return (
<CanvasManagerProviderGate>
<Flex w="full" gap={2} alignItems="center">
<ToolChooser />
<Spacer />
<ToolSettings />
<Spacer />
<CanvasToolbarScale />
<CanvasToolbarResetViewButton />
<Spacer />
<ToolColorPicker />
<CanvasToolbarFitBboxToLayersButton />
<CanvasToolbarSaveToGalleryButton />
<CanvasSettingsPopover />
</Flex>
</CanvasManagerProviderGate>
<Flex w="full" gap={2} alignItems="center">
<ToolChooser />
<Spacer />
<ToolSettings />
<Spacer />
<CanvasToolbarScale />
<CanvasToolbarResetViewButton />
<Spacer />
<ToolColorPicker />
<CanvasToolbarFitBboxToLayersButton />
<CanvasToolbarSaveToGalleryButton />
<CanvasSettingsPopover />
</Flex>
);
});