diff --git a/src/core/main/custom/toolbar.ts b/src/core/main/custom/toolbar.ts index aa79337..0438cd6 100644 --- a/src/core/main/custom/toolbar.ts +++ b/src/core/main/custom/toolbar.ts @@ -15,8 +15,6 @@ interface CustomToolbarEvent extends EmitableEvent { emit: (id: string) => void; } -type ToolbarItemType = 'hotkey' | 'item' | 'assistKey'; - interface ToolbarItemBase { type: T; id: string; @@ -45,6 +43,8 @@ interface ToolbarItemMap { assistKey: AssistKeyToolbarItem; } +type ToolbarItemType = keyof ToolbarItemMap; + export type SettableItemData = Omit; diff --git a/src/ui/toolbar.vue b/src/ui/toolbar.vue index a3a6691..68e2dc0 100644 --- a/src/ui/toolbar.vue +++ b/src/ui/toolbar.vue @@ -84,14 +84,14 @@ function click() { height: 50px; cursor: pointer; background-color: #222; - border: 1px solid #ddd8; + border: 1.5px solid #ddd8; justify-content: center; align-items: center; transition: all 0.1s linear; } .toolbar-item::v-deep(> *) { - height: 50px; + height: 100%; min-width: 50px; display: flex; justify-content: center; @@ -99,6 +99,12 @@ function click() { text-align: center; text-overflow: clip; text-wrap: nowrap; + overflow: hidden; +} + +.toolbar-item::v-deep(.button-text)[active='true'] { + color: gold; + background-color: #555; } .toolbar-item:hover {