0906 #24 繼續

pulipulichen · Sep 5, 2019 · 9ae12b1 · 9ae12b1
1 parent 4d2ad79
commit 9ae12b1
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 18 deletions.
diff --git a/app/index.html b/app/index.html
@@ -22,7 +22,7 @@
   <body>
 
   <div id="app"
-       v-bind:data-theme="config.theme">
+       v-bind:style="{'backgroundColor': status.theme }">
     <menu-bar v-bind:lib="lib" 
               v-bind:status="status"
               v-bind:config="config"

diff --git a/app/webpack/dist/bundle.js b/app/webpack/dist/bundle.js
diff --git a/app/webpack/dist/bundle.js.map b/app/webpack/dist/bundle.js.map
diff --git a/app/webpack/src/VueController.js b/app/webpack/src/VueController.js
@@ -28,6 +28,7 @@ let VueController = {
       fileType: 'plain-text', // default
       fontSizeAdjustIsEnlarge: null,
       mainComponent: null,
+      theme: null
     },
     lib: {},
   },
@@ -79,8 +80,10 @@ let VueController = {
       this.setupFile()
 
       this.$refs.MenuBar.resetNoteHeader()
+      this.initTheme()
       //console.log('OK')
       this.status.isReady = true
+      this.lib.win.show()
     },
     setupFile: function () {
       // -------------------------------------
@@ -105,7 +108,8 @@ let VueController = {
       }
       if (this.config.debug.useTestImageViewerFile === true) {
         //this.status.filePath = this.lib.ElectronFileHelper.resolve('demo/dog 1280.webp')
-        this.status.filePath = this.lib.ElectronFileHelper.resolve('demo/rstudio-ball.ico')
+        //this.status.filePath = this.lib.ElectronFileHelper.resolve('demo/rstudio-ball.ico')
+        this.status.filePath = this.lib.ElectronFileHelper.resolve('demo/git.png')
         //this.status.filePath = this.lib.ElectronFileHelper.resolve('demo/dog.jpg')
         //console.log(this.status.filePath)
         //console.log(this.lib.ElectronImageFileHelper.isImageFile(this.status.filePath))
@@ -161,9 +165,10 @@ let VueController = {
 
       return this
     },
-    a: function () {
-      // for test
-      return 'AAA'
+    initTheme: function () {
+      console.log('initTheme')
+      this.status.theme = this.config.themes[0]
+      return this
     }
   } // methods: {
 }

diff --git a/app/webpack/src/components/ContentImageViewer/ContentImageViewer.global.less b/app/webpack/src/components/ContentImageViewer/ContentImageViewer.global.less
@@ -3,10 +3,14 @@
   left: 0;
   width: 100vw;
   height: calc(100vh - 40px);
-  background-color: black;
+  //background-color: black;
 
   .openseadragon-container {
     width: 100vw;
     height: calc(100vh - 40px);
+
+    .navigator {
+      background-color: rgba(0,0,0,0.5) !important;
+    }
   }
 }
diff --git a/app/webpack/src/config.js b/app/webpack/src/config.js
@@ -1,6 +1,5 @@
 module.exports = {
   locale: 'zh-TW',
-  theme: 'yellow',
   maxHeightRatio: 0.7,
   minHeightPx: 250,
   maxWidthRatio: 0.5,
@@ -18,10 +17,10 @@ module.exports = {
   ],
 
   debug: {
-    useTestContentText: true,
+    useTestContentText: false,
     useTestCodeFile: false,
     useTestImageStaticFile: false,
-    useTestImageViewerFile: false,
+    useTestImageViewerFile: true,
     useTestPlainTextFile: false,
   }
 }
diff --git a/demo/git.png b/demo/git.png
diff --git a/electron-shell/CreateWindow.js b/electron-shell/CreateWindow.js
@@ -124,6 +124,8 @@ module.exports = function (filePath, callback) {
     }
   })
 
+  win.hide()
+
   IPCEventManager(win)
   return win
 }