Merge pull request #23 from nkolba/fix-14

Fix 14
finos · Apr 15, 2022 · 088f7ce · 088f7ce
2 parents 8d079ba + c5e58d0
commit 088f7ce
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/directory/src/routes/root.ts b/directory/src/routes/root.ts
@@ -1,15 +1,13 @@
 import { FastifyInstance } from 'fastify';
 
-export const root = (fastify : FastifyInstance, options, done) => {
-    fastify.get('/', async (request, reply) => {
-        console.log("root request", request);
-        reply
-            .code(200)
-            .header('Content-Type', 'application/json; charset=utf-8')
-            .send({"description":"FDC3 App Directory API","version":"1.2"});
-
-      });
+export const root = (fastify: FastifyInstance, options, done) => {
+  fastify.get('/', async (request, reply) => {
+    console.log('root request', request);
+    reply
+      .code(200)
+      .header('Content-Type', 'application/json; charset=utf-8')
+      .send({ description: 'FDC3 App Directory API', version: '1.2' });
+  });
 
-      done();
-
-};
+  done();
+};
diff --git a/packages/main/src/workspace.ts b/packages/main/src/workspace.ts
@@ -33,6 +33,9 @@ const SEARCH_RESULTS_PRELOAD = join(
   '../../preload/dist/searchResults/index.cjs',
 );
 
+const CHANNEL_WINDOW_WIDTH = 130;
+const CHANNEL_WINDOW_HEIGHT = 90;
+
 export class Workspace {
   constructor(config?: WorkspaceConfig) {
     this.id = utils.guid();
@@ -383,8 +386,8 @@ export class Workspace {
     console.log('creatChannelWIndow');
     return new Promise((resolve, reject) => {
       this.channelWindow = new BrowserWindow({
-        height: 100,
-        width: 140,
+        height: CHANNEL_WINDOW_HEIGHT,
+        width: CHANNEL_WINDOW_WIDTH,
         hasShadow: true,
         show: false,
         frame: false,
@@ -436,7 +439,7 @@ export class Workspace {
       });
       const winPos: number[] = this.window ? this.window.getPosition() : [0, 0];
       this.channelWindow.setPosition(
-        winPos[0] + (xOffset || 0),
+        winPos[0] + ((xOffset || 0) - CHANNEL_WINDOW_WIDTH),
         winPos[1] + (yOffset || 0),
       );
       this.channelWindow.show();

diff --git a/packages/preload/src/index.ts b/packages/preload/src/index.ts
@@ -26,16 +26,14 @@ ipcRenderer.on(TOPICS.ADD_TAB, (event, args) => {
       title: args.title,
     },
   });
-  
-  if (frameReady){
+
+  if (frameReady) {
     document.dispatchEvent(tabEvent);
-  }
-  else {
+  } else {
     document.addEventListener(TOPICS.FRAME_READY, () => {
       document.dispatchEvent(tabEvent);
     });
   }
-
 });
 
 ipcRenderer.on(TOPICS.SELECT_TAB, (event, args) => {