Skip to content

ui: follow up fixes #6894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

ui: follow up fixes #6894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8ec5e3
optimize(ui): grid images per row math
blessedcoolant Sep 19, 2024
810ef7c
ui(fix): do not disable buttons if they are active tools
blessedcoolant Sep 19, 2024
e032e7d
fix(ui): Rectangle Tool having the incorrect hotkey display
blessedcoolant Sep 19, 2024
eea7447
ui: rearrange entity options order to make more sense
blessedcoolant Sep 19, 2024
f2cc7aa
ui(fix): Rect tool hotkey to match PS hotkey (U)
blessedcoolant Sep 19, 2024
15c4111
ui(fix): Match the fill color display border to match
blessedcoolant Sep 19, 2024
09b21e2
ui: Move layer visibility toggle to start of layer
blessedcoolant Sep 19, 2024
dad3613
Revert "optimize(ui): grid images per row math"
blessedcoolant Sep 19, 2024
01740a0
Revert "ui: Move layer visibility toggle to start of layer"
blessedcoolant Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .../features/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ export const EntityListSelectedEntityActionBar = memo(() => {
return (
<Flex w="full" gap={2} alignItems="center" ps={1}>
<EntityListSelectedEntityActionBarOpacity />
<Spacer />
<EntityListSelectedEntityActionBarFill />
<Spacer />
<Flex h="full">
<EntityListSelectedEntityActionBarFilterButton />
<EntityListGlobalActionBarAddLayerMenu />
<EntityListSelectedEntityActionBarDuplicateButton />
<EntityListSelectedEntityActionBarTransformButton />
<EntityListSelectedEntityActionBarFilterButton />
<EntityListSelectedEntityActionBarSaveToAssetsButton />
<EntityListSelectedEntityActionBarDuplicateButton />
<EntityListGlobalActionBarAddLayerMenu />
</Flex>
</Flex>
);
Expand Down
4 changes: 2 additions & 2 deletions ...tures/controlLayers/components/CanvasEntityList/EntityListSelectedEntityActionBarFill.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ export const EntityListSelectedEntityActionBarFill = memo(() => {
<Flex w="full" h="full" alignItems="center" justifyContent="center">
<Box
borderRadius="full"
borderColor="base.300"
borderColor="base.600"
w={6}
h={6}
borderWidth={1}
borderWidth={2}
bg={rgbColorToString(fill.color)}
/>
</Flex>
Expand Down
1 change: 0 additions & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBboxButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const ToolBboxButton = memo(() => {
colorScheme={isSelected ? 'invokeBlue' : 'base'}
variant="solid"
onClick={selectBbox}
isDisabled={isSelected}
/>
);
});
Expand Down
1 change: 0 additions & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolBrushButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const ToolBrushButton = memo(() => {
colorScheme={isSelected ? 'invokeBlue' : 'base'}
variant="solid"
onClick={selectBrush}
isDisabled={isSelected}
/>
);
});
Expand Down
1 change: 0 additions & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolColorPickerButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const ToolColorPickerButton = memo(() => {
colorScheme={isSelected ? 'invokeBlue' : 'base'}
variant="solid"
onClick={selectColorPicker}
isDisabled={isSelected}
/>
);
});
Expand Down
1 change: 0 additions & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolEraserButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const ToolEraserButton = memo(() => {
colorScheme={isSelected ? 'invokeBlue' : 'base'}
variant="solid"
onClick={selectEraser}
isDisabled={isSelected}
/>
);
});
Expand Down
4 changes: 2 additions & 2 deletions invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolFillColorPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ export const ToolColorPicker = memo(() => {
<Flex w="full" h="full" alignItems="center" justifyContent="center">
<Box
borderRadius="full"
borderColor="base.300"
borderColor="base.600"
w={6}
h={6}
borderWidth={1}
borderWidth={2}
bg={rgbaColorToString(fill)}
/>
</Flex>
Expand Down
1 change: 0 additions & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolMoveButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const ToolMoveButton = memo(() => {
colorScheme={isSelected ? 'invokeBlue' : 'base'}
variant="solid"
onClick={selectMove}
isDisabled={isSelected}
/>
);
});
Expand Down
1 change: 0 additions & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolRectButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const ToolRectButton = memo(() => {
colorScheme={isSelected ? 'invokeBlue' : 'base'}
variant="solid"
onClick={selectRect}
isDisabled={isSelected}
/>
);
});
Expand Down
1 change: 0 additions & 1 deletion invokeai/frontend/web/src/features/controlLayers/components/Tool/ToolViewButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const ToolViewButton = memo(() => {
colorScheme={isSelected ? 'invokeBlue' : 'base'}
variant="solid"
onClick={selectView}
isDisabled={isSelected}
/>
);
});
Expand Down
2 changes: 1 addition & 1 deletion invokeai/frontend/web/src/features/system/components/HotkeysModal/useHotkeyData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const useHotkeyData = (): HotkeysData => {
addHotkey('canvas', 'incrementToolWidth', [']']);
addHotkey('canvas', 'selectEraserTool', ['e']);
addHotkey('canvas', 'selectMoveTool', ['v']);
addHotkey('canvas', 'selectRectTool', ['r']);
addHotkey('canvas', 'selectRectTool', ['u']);
addHotkey('canvas', 'selectViewTool', ['h']);
addHotkey('canvas', 'selectColorPickerTool', ['i']);
addHotkey('canvas', 'setFillToWhite', ['d']);
Expand Down
Loading