Upper case theme name.

cweijan · Mar 4, 2024 · dd8f318 · dd8f318
1 parent ca76d4c
commit dd8f318
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -461,9 +461,9 @@
 				"vscode-office.editorTheme": {
 					"type": "string",
 					"enum": [
-						"light",
-						"auto",
-						"solarized"
+						"Auto",
+						"Light",
+						"Solarized"
 					],
 					"default": "light",
 					"markdownDescription": "The theme for the Markdown editor."

diff --git a/resource/vditor/css/theme/auto.css → resource/vditor/css/theme/Auto.css b/resource/vditor/css/theme/auto.css → resource/vditor/css/theme/Auto.css
diff --git a/resource/vditor/css/theme/light.css → resource/vditor/css/theme/Light.css b/resource/vditor/css/theme/light.css → resource/vditor/css/theme/Light.css
diff --git a/resource/vditor/css/theme/solarized.css → resource/vditor/css/theme/Solarized.css b/resource/vditor/css/theme/solarized.css → resource/vditor/css/theme/Solarized.css
diff --git a/resource/vditor/index.css b/resource/vditor/index.css
@@ -21,4 +21,10 @@ a {
 
 .win32 *{
     text-shadow: 0 0 0.55px #7c7c7cdd;
+}
+
+.vditor-toolbar__item .vditor-tooltipped[data-type="selectTheme"]{
+    width: 55px;
+    font-size: 14px;
+    color: var(--vscode-charts-red);
 }
diff --git a/resource/vditor/util.js b/resource/vditor/util.js
@@ -87,6 +87,14 @@ export async function getToolbar(resPath) {
         },
         { name: 'upload', tipPosition: 'e' },
         "|",
+        {
+            name:'selectTheme',
+            tipPosition: 's', tip: 'Select Theme',
+            icon: 'Theme:',
+            click() {
+                handler.emit("theme")
+            }
+        },
         {
             tipPosition: 's', tip: 'Select Theme',
             icon: await loadRes(`${resPath}/icon/theme.svg`),

diff --git a/src/provider/markdownEditorProvider.ts b/src/provider/markdownEditorProvider.ts
@@ -114,8 +114,16 @@ export class MarkdownEditorProvider implements vscode.CustomTextEditorProvider {
         }).on("export", (option) => {
             vscode.commands.executeCommand('workbench.action.files.save');
             new MarkdownService(this.context).exportMarkdown(uri, option)
-        }).on("theme", () => {
-            vscode.commands.executeCommand('workbench.action.selectTheme');
+        }).on("theme", async (theme) => {
+            if (!theme) {
+                const themes = ["Auto", "Light", "Solarized"]
+                const editorTheme = Global.getConfig('editorTheme');
+                const themeItems: vscode.QuickPickItem[] = themes.map(theme => ({ label: theme, description: theme == editorTheme ? 'Current' : undefined }))
+                theme = await vscode.window.showQuickPick(themeItems, { placeHolder: "Select Editor Theme" });
+                if (!theme) return
+            }
+            handler.emit('theme', theme.label)
+            Global.updateConfig('editorTheme', theme.label)
         }).on("saveOutline", (enable) => {
             config.update("openOutline", enable, true)
         }).on('developerTool', () => {