fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-18 18:38:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tool-settings

Browse Source
This commit is contained in:
Henry Sloan
2021-07-20 01:24:02 -04:00
committed by GitHub
parent 8e56a274fe bc733acb4c
commit 8ea6fd8d6a
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/web/src/components/panels/Document.vue
View File

@@ -10,7 +10,7 @@
</div>
<div class="spacer"></div>
<div class="right side">
<OptionalInput v-model:checked="snappingEnabled" :icon="'Snapping'" />
<OptionalInput v-model:checked="snappingEnabled" :icon="'Snapping'" title="Snapping" />
<PopoverButton>
<h3>Snapping</h3>
<p>More snapping options will be here</p>
@@ -18,7 +18,7 @@
<Separator :type="SeparatorType.Unrelated" />
<OptionalInput v-model:checked="gridEnabled" :icon="'Grid'" />
<OptionalInput v-model:checked="gridEnabled" :icon="'Grid'" title="Grid" />
<PopoverButton>
<h3>Grid</h3>
<p>More grid options will be here</p>
@@ -26,7 +26,7 @@
<Separator :type="SeparatorType.Unrelated" />
<OptionalInput v-model:checked="overlaysEnabled" :icon="'Overlays'" />
<OptionalInput v-model:checked="overlaysEnabled" :icon="'Overlays'" title="Overlays" />
<PopoverButton>
<h3>Overlays</h3>
<p>More overlays options will be here</p>
@@ -40,8 +40,8 @@
<IconButton :icon="'ViewModePixels'" :size="24" title="View Mode: Pixels" />
</RadioInput>
<PopoverButton>
<h3>Display Mode</h3>
<p>More display mode options will be here</p>
<h3>View Mode</h3>
<p>More view mode options will be here</p>
</PopoverButton>
<Separator :type="SeparatorType.Section" />

8
client/web/src/components/widgets/floating-menus/MenuList.vue
View File

@@ -6,7 +6,7 @@
v-for="(entry, entryIndex) in section"
:key="entryIndex"
class="row"
:class="{ open: isMenuEntryOpen(entry), active: entry === currentEntry }"
:class="{ open: isMenuEntryOpen(entry), active: entry === activeEntry }"
@click="handleEntryClick(entry)"
@mouseenter="handleEntryMouseEnter(entry)"
@mouseleave="handleEntryMouseLeave(entry)"
@@ -23,10 +23,7 @@
v-if="entry.children"
:direction="MenuDirection.TopRight"
:menuEntries="entry.children"
v-model:active-entry="currentEntry"
:minWidth="minWidth"
:drawIcon="drawIcon"
:scrollable="scrollable"
v-bind="{ defaultAction, minWidth, drawIcon, scrollable }"
:ref="(ref) => setEntryRefs(entry, ref)"
/>
</div>
@@ -248,7 +245,6 @@ const MenuList = defineComponent({
},
data() {
return {
currentEntry: this.activeEntry,
keyboardLockInfoMessage: keyboardLockApiSupported() ? KEYBOARD_LOCK_USE_FULLSCREEN : KEYBOARD_LOCK_SWITCH_BROWSER,
SeparatorDirection,
SeparatorType,