Merge branch 'develop' into issue/#265-move-misc-icons

src/App.vue

@@ -58,7 +58,7 @@ export default {
       config: {},
       contentTypes: [],
       contentUrls: [],
-      fontsize: 14,
+      fontsize: 16,
       imageurl: '',
       isCollection: false,
       item: {},
@@ -394,6 +394,7 @@ export default {
   display: flex;
   flex: 1;
   flex-direction: column;
+  font-size: 16px;
   overflow: hidden;
 }
 

src/components/annotations/annotations.vue

@@ -118,7 +118,7 @@ export default {
         };
       });
 
-      this.annotations.forEach((curr) => {
+      this.configuredAnnotations.forEach((curr) => {
         const contentType = curr.body.['x-content-type'];
         if (contentTypes[contentType]) {
           annotationTab[contentTypes[contentType]].type.push(contentType);
@@ -141,9 +141,10 @@ export default {
 
       const interval = setInterval(() => {
         if (this.annotationLoading) {
+          this.configuredAnnotations = this.filterAnnotationTypes();
+
           const firstTab = this.annotationTabs.find((x) => x.type.length)?.key || '';
 
-          this.configuredAnnotations = this.filterAnnotationTypes();
           this.highlightActiveTabContent(this.annotationTabConfig[firstTab] || []);
           this.currentTab = firstTab;
           clearInterval(interval);

src/components/content.vue

@@ -24,6 +24,7 @@
         flat
         round
         size="sm"
+        :disable="fontsize >= fontSizeLimits.max"
         :title="$t('Increase')"
         @click="increase()"
       >
@@ -39,6 +40,7 @@
         flat
         round
         size="sm"
+        :disable="fontsize <= fontSizeLimits.min"
         :title="$t('Decrease')"
         :color="$q.dark.isActive ? 'white' : 'accent'"
         @click="decrease()"
@@ -80,7 +82,7 @@ export default {
     },
     fontsize: {
       type: Number,
-      default: () => 14,
+      default: () => 16,
     },
     manifests: {
       type: Array,
@@ -98,6 +100,10 @@ export default {
   data: () => ({
     activeTab: null,
     content: '',
+    fontSizeLimits: {
+      min: 14,
+      max: 24,
+    },
     sequenceindex: 0,
   }),
   computed: {
@@ -144,17 +150,21 @@ export default {
   },
   methods: {
     decrease() {
-      const min = 8;
+      const { min } = this.fontSizeLimits;
       let textsize = this.fontsize;
 
-      textsize -= textsize > min ? 1 : 0;
+      textsize -= textsize > min ? 2 : 0;
+      if (textsize < min) textsize = min;
+
       this.$root.$emit('update-fontsize', textsize);
     },
     increase() {
-      const max = 32;
+      const { max } = this.fontSizeLimits;
       let textsize = this.fontsize;
 
-      textsize += textsize < max ? 1 : 0;
+      textsize += textsize < max ? 2 : 0;
+      if (textsize > max) textsize = max;
+
       this.$root.$emit('update-fontsize', textsize);
     },
     getSupport(support) {

src/views/mainview.vue

@@ -107,7 +107,7 @@ export default {
     },
     fontsize: {
       type: Number,
-      default: () => 14,
+      default: () => 16,
     },
     imageurl: {
       type: String,