Minor bugfixes

- When doing long-running canvas image exporting actions, display indeterminate progress bar
- Fix staging area image outline not displaying after committing/discarding results
This commit is contained in:
psychedelicious 2022-11-20 13:45:29 +11:00 committed by blessedcoolant
parent b6dd5b664c
commit f08c78a043
3 changed files with 10 additions and 2 deletions

View File

@ -331,6 +331,7 @@ export const canvasSlice = createSlice({
state.layerState.stagingArea = { state.layerState.stagingArea = {
...initialLayerState.stagingArea, ...initialLayerState.stagingArea,
}; };
state.shouldShowStagingOutline = true;
}, },
addLine: (state, action: PayloadAction<number[]>) => { addLine: (state, action: PayloadAction<number[]>) => {
const { tool, layer, brushColor, brushSize } = state; const { tool, layer, brushColor, brushSize } = state;
@ -618,6 +619,7 @@ export const canvasSlice = createSlice({
}; };
state.futureLayerStates = []; state.futureLayerStates = [];
state.shouldShowStagingOutline = true;
}, },
fitBoundingBoxToStage: (state) => { fitBoundingBoxToStage: (state) => {
const { const {

View File

@ -11,6 +11,7 @@ import {
setCurrentStatus, setCurrentStatus,
setIsCancelable, setIsCancelable,
setIsProcessing, setIsProcessing,
setProcessingIndeterminateTask,
} from 'features/system/store/systemSlice'; } from 'features/system/store/systemSlice';
import { addImage } from 'features/gallery/store/gallerySlice'; import { addImage } from 'features/gallery/store/gallerySlice';
import { setMergedCanvas } from '../canvasSlice'; import { setMergedCanvas } from '../canvasSlice';
@ -42,8 +43,7 @@ export const mergeAndUploadCanvas =
shouldSetAsInitialImage, shouldSetAsInitialImage,
} = config; } = config;
dispatch(setCurrentStatus('Exporting Image')); dispatch(setProcessingIndeterminateTask('Exporting Image'));
dispatch(setIsProcessing(true));
dispatch(setIsCancelable(false)); dispatch(setIsCancelable(false));
const state = getState() as RootState; const state = getState() as RootState;

View File

@ -214,6 +214,11 @@ export const systemSlice = createSlice({
clearToastQueue: (state) => { clearToastQueue: (state) => {
state.toastQueue = []; state.toastQueue = [];
}, },
setProcessingIndeterminateTask: (state, action: PayloadAction<string>) => {
state.isProcessing = true;
state.currentStatus = action.payload;
state.currentStatusHasSteps = false;
},
}, },
}); });
@ -241,6 +246,7 @@ export const {
generationRequested, generationRequested,
addToast, addToast,
clearToastQueue, clearToastQueue,
setProcessingIndeterminateTask,
} = systemSlice.actions; } = systemSlice.actions;
export default systemSlice.reducer; export default systemSlice.reducer;