diff --git a/public/vcd.css b/public/vcd.css index a0befd1..af18a6c 100644 --- a/public/vcd.css +++ b/public/vcd.css @@ -1,27 +1,16 @@ +:root { + --display-signal-info-height: 50px; + --signal-default-color: #4CAF50; + --main-color: #CB81DA; +} + html, body { background-color: var(--background); color: var(--foreground); } -.vcd-sidebar { - position: absolute; - top: 20px; - left: 0px; - background-color: var(--sidebar); - border: solid 1px var(--sidebar-border); - min-width: var(--sidebar-min-width); -} - -.vcd-sidebar-item { - color: var(--sidebar-item-text); -} - -.vcd-toolbar { - -} - -.vcd-render { - +body::-webkit-scrollbar { + width: 0; } * hr { @@ -70,7 +59,8 @@ html, body { .el-select-dropdown { min-width: 300px !important; background-color: var(--sidebar); - border: 1px solid var(--main-color); + border: 1.0px solid var(--main-color); + outline: none; } .el-checkbox-button__inner { diff --git a/public/vscode.css b/public/vscode.css index b6d7fd7..1ea0bed 100644 --- a/public/vscode.css +++ b/public/vscode.css @@ -144,8 +144,6 @@ --color-orange: #ffab40; --color-deepOrange: #ff6e40; - --main-color: #CB81DA; - /* Settings */ --settings-action-background: var(--background); } \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 2b276c0..ec8dfff 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,11 +1,8 @@ + + \ No newline at end of file diff --git a/src/components/treeview/index.vue b/src/components/treeview/index.vue index 099c3a3..8ed46c0 100644 --- a/src/components/treeview/index.vue +++ b/src/components/treeview/index.vue @@ -71,12 +71,14 @@ export default { border-radius: 1.0em; display: flex; flex-direction: column; + transition: height .5s ease-in-out; } .vcd-module-wrapper { flex: 1; display: flex; overflow: scroll; + transition: flex .5s ease-in-out; } \ No newline at end of file diff --git a/src/components/treeview/search.vue b/src/components/treeview/search.vue index dd8ac42..bedccd4 100644 --- a/src/components/treeview/search.vue +++ b/src/components/treeview/search.vue @@ -53,13 +53,15 @@ export default { const stacks = [ { name: '', body: globalLookup.topModules } ]; const searchRule = new Set(globalSetting.searchScope); const caseSensitivity = globalSetting.caseSensitivity; + const displayParentOnly = globalSetting.displayParentOnly; + while (stacks.length > 0) { const p = stacks.pop(); if (p.body && p.body.length) { p.body.forEach(mod => stacks.push(mod)); } - const searchResultItem = makeSearchResultItem(searchString, p, searchRule, caseSensitivity); + const searchResultItem = makeSearchResultItem(searchString, p, searchRule, caseSensitivity, displayParentOnly); if (searchResultItem) { searchManage.searchResult.push(searchResultItem); } @@ -95,6 +97,7 @@ export default { .tree-view-search-wrapper { min-height: 30px; padding: 10px; + transition: flex .5s ease-in-out; } .search-result { diff --git a/src/components/treeview/signals.vue b/src/components/treeview/signals.vue index 90f9985..7feed3c 100644 --- a/src/components/treeview/signals.vue +++ b/src/components/treeview/signals.vue @@ -9,8 +9,8 @@ :class="globalLookup.currentWires.has(signal) ? 'vcd-treeview-selected' : ''">
 {{ signal.name }}
-
- {{ signal.caption }} +
+ {{ makeSignalCaption(signal) }}
@@ -38,15 +38,13 @@ export default { emitter.on('tree-view', sendWires => { signals.content.length = 0; - for (const signal of sendWires) { - const caption = signal.size === 1 ? '' : `${signal.size - 1}:0`; - signals.content.push({ - name: signal.name, - caption - }); - } + signals.content = sendWires; }); + function makeSignalCaption(signal) { + return signal.size === 1 ? '' : `${signal.size - 1}:0`; + } + function clickItem(signal) { if (globalLookup.currentWires.has(signal)) { globalLookup.currentWires.delete(signal); @@ -59,6 +57,7 @@ export default { signals, clickItem, globalLookup, + makeSignalCaption, t } } @@ -67,7 +66,7 @@ export default {