colors fix

This commit is contained in:
Hugh Bord 2021-03-29 11:03:42 +10:00
parent 88d7752c80
commit 68b26094a3
2 changed files with 14 additions and 36 deletions

View File

@ -159,48 +159,18 @@ export default {
},
startColorChange(type) {
if (type === 0) {
// // Fg
this.$store.getters.getToolbarState.isChoosingFg = true;
this.$store.commit("changeIsUpdatingFg", true)
} else {
// // Bg
this.$store.getters.getToolbarState.isChoosingBg = true;
this.$store.commit("changeIsUpdatingBg", true)
}
},
onColorChange(color) {
if (this.$store.getters.getToolbarState.isChoosingFg) {
this.updateColor(0, color);
this.$store.commit("changeColorFg", color);
}
if (this.$store.getters.getToolbarState.isChoosingBg) {
this.updateColor(1, color);
}
},
updateColor(type, color) {
if (
this.$store.getters.getToolbarState.isChoosingBg ||
this.$store.getters.getToolbarState.isChoosingFg
) {
switch (type) {
// FG
case 0:
this.$store.commit("changeColorFg", color);
this.currentColorFg = color;
break;
// BG
case 1:
this.$store.commit("changeColorBg", color);
this.currentColorBg = color;
break;
}
this.$store.getters.getToolbarState.isChoosingBg = false;
this.$store.getters.getToolbarState.isChoosingFg = false;
this.$store.commit(
"updateToolBarState",
$store.getters.getToolbarState
);
this.$store.commit("changeColorBg", color);
}
},
},

View File

@ -110,19 +110,27 @@ export default new Vuex.Store({
changeColorFg(state, payload) {
state.toolbarState.currentColorFg = payload;
state.toolbarState.isUpdating = false
state.toolbarState.isChoosingFg = false
},
changeColorBg(state, payload) {
state.toolbarState.currentColorBg = payload;
state.toolbarState.isUpdating = false
state.toolbarState.isChoosingBg = false
},
changeTool(state, payload) {
state.toolbarState.currentTool = payload;
},
changeIsUpdatingFg(state, payload) {
state.toolbarState.isChoosingFg = payload
},
changeIsUpdatingBg(state, payload) {
state.toolbarState.isChoosingBg = payload
},
changeTargetingFg(state, payload) {
state.toolbarState.targetingFg = payload;
state.toolbarState.targetingFg = payload
},
changeTargetingBg(state, payload) {
state.toolbarState.targetingBg = payload;
state.toolbarState.targetingBg = payload
},
changeTargetingText(state, payload) {
state.toolbarState.targetingText = payload;