Move vue tweaks.

grantjbutler · Feb 10, 2022 · f8956a2 · f8956a2
1 parent 3528e88
commit f8956a2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 32 deletions.
diff --git a/packages/renderer/src/App.vue b/packages/renderer/src/App.vue
@@ -15,40 +15,28 @@
       <controls class="flex-none border-l border-system-divider" />
     </div>
     <preferences-modal
+      v-if="isWindows"
       :open="isSettingsOpen"
       @close="closeSettings"
     />
   </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, ref } from 'vue';
+<script lang="ts" setup>
+import { ref } from 'vue';
 import Preview from './components/Preview.vue';
 import Sidebar from './components/Sidebar.vue';
 import Controls from './components/Controls.vue';
 import NavBar from './components/NavBar.vue';
 import CommandBar from './components/CommandBar.vue';
 import PreferencesModal from './components/Preferences/Modal.vue';
 import { useIsMacOS, useIsWindows } from './integration/platform';
-export default defineComponent({
-  name: 'App',
-  components: {
-    Preview,
-    Sidebar,
-    Controls,
-    NavBar,
-    CommandBar,
-    PreferencesModal,
-  },
-  setup() {
-    const isSettingsOpen = ref(false);
-    return {
-      isMacOS: useIsMacOS(),
-      isWindows: useIsWindows(),
-      isSettingsOpen,
-      openSettings: () => isSettingsOpen.value = true,
-      closeSettings: () => isSettingsOpen.value = false,
-    };
-  },
-});
+
+const isMacOS = useIsMacOS();
+const isWindows = useIsWindows();
+
+const isSettingsOpen = ref(false);
+
+const openSettings = () => isSettingsOpen.value = true;
+const closeSettings = () => isSettingsOpen.value = false;
 </script>
diff --git a/packages/renderer/src/Preferences.vue b/packages/renderer/src/Preferences.vue
@@ -1,13 +1,7 @@
 <template>
-  <Content></Content>
+  <Content />
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue'
+<script lang="ts" setup>
 import Content from '/@/components/Preferences/Content.vue';
-export default defineComponent({
-  components: {
-    Content
-  }
-})
 </script>
diff --git a/packages/renderer/src/components/Preferences/Modal.vue b/packages/renderer/src/components/Preferences/Modal.vue
@@ -3,7 +3,7 @@
     :open="open"
     class="fixed inset-x-0 bottom-0 z-10 flex flex-col bg-white"
     style="top: env(titlebar-area-height, 40px);"
-    @close="close"
+    @close="$emit('close')"
   >
     <DialogTitle class="flex mb-4 space-x-2 text-4xl font-light">
       <button