Merge pull request #39 from SmilyOrg/context-fixes

Context menu fixes
SmilyOrg · Sep 18, 2022 · 75ab857 · 75ab857
2 parents fc899f6 + 1807813
commit 75ab857
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/ui/src/App.vue b/ui/src/App.vue
@@ -88,7 +88,7 @@
             :expanded="settingsExtraExpanded"
             @click="settingsExtraExpanded = !settingsExtraExpanded"
           ></expand-button>
-          <template v-if="settingsExtraExpanded">
+          <div v-if="settingsExtraExpanded">
             <ui-form-field>
               <ui-checkbox v-model="settings.debug.overdraw"></ui-checkbox>
               <label>Debug Overdraw</label>
@@ -97,7 +97,7 @@
               <ui-checkbox v-model="settings.debug.thumbnails"></ui-checkbox>
               <label>Debug Thumbnails</label>
             </ui-form-field>
-          </template>
+          </div>
         </div>
         <ui-icon-button
           icon="settings"

diff --git a/ui/src/components/ExpandButton.vue b/ui/src/components/ExpandButton.vue
@@ -2,8 +2,8 @@
   <ui-button
     class="expand"
   >
-    <ui-icon v-if="expanded">expand_less</ui-icon>
-    <ui-icon v-if="!expanded">expand_more</ui-icon>
+    <ui-icon class="icon" v-if="expanded">expand_less</ui-icon>
+    <ui-icon class="icon" v-if="!expanded">expand_more</ui-icon>
   </ui-button>
 </template>
 
@@ -20,4 +20,8 @@ export default {
   height: 20px;
 }
 
+.icon {
+  pointer-events: none;
+}
+
 </style>
diff --git a/ui/src/components/RegionMenu.vue b/ui/src/components/RegionMenu.vue
@@ -42,15 +42,15 @@
         </ui-item>
       </ui-nav>
       <div v-if="expanded" class="thumbnails">
-        <ui-nav-item
+        <a
           v-for="thumb in region.data?.thumbnails"
           :key="thumb.name"
           class="thumbnail"
           :href="getThumbnailUrl(region.data.id, thumb.name, thumb.filename)"
           target="_blank"
         >
           {{ thumb.width }}
-        </ui-nav-item>
+        </a>
       </div>
       <expand-button
         :expanded="expanded"
@@ -140,8 +140,13 @@ export default {
 
 .thumbnail {
   font-size: 0.8em;
-  padding: 6px;
-  height: 24px;
+  padding: 10px 6px;
+  text-decoration: none;
+  color: var(--mdc-theme-text-primary-on-background);
+}
+
+.thumbnail:hover {
+  background: rgb(241, 241, 241);
 }
 
 .filename {

diff --git a/ui/src/components/TileViewer.vue b/ui/src/components/TileViewer.vue
@@ -186,6 +186,7 @@ export default {
       this.v = this.map.getView();
 
       this.setInteractive(this.interactive);
+      this.setView(this.view || this.latestView);
       this.$emit("viewer", this.map);
 
     },