Skip to content

Commit 5369603

Browse files
authored
Merge pull request #448 from shuzijun/gradle
fix TimerStatusBarWidge;fix color format
2 parents a61135c + 5d6051c commit 5369603

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/main/java/com/shuzijun/leetcode/plugin/editor/LCVPreview.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.io.IOException;
4040
import java.io.InputStream;
4141
import java.text.DecimalFormat;
42+
import java.text.DecimalFormatSymbols;
4243

4344
/**
4445
* @author shuzijun
@@ -191,7 +192,7 @@ private String getStyle(boolean isTag) {
191192
sb.append("}");
192193
sb.append("::-webkit-scrollbar-track {background-color:").append(toHexColor(defaultBackground)).append(";}");
193194
sb.append("::-webkit-scrollbar-thumb {background-color:").append(toHexColor(scrollbarThumbColor)).append(";}");
194-
sb.append(".vditor-reset {font-size:").append(editorColorsScheme.getEditorFontSize()).append(";");
195+
sb.append(".vditor-reset {font-size:").append(editorColorsScheme.getEditorFontSize()).append("px;");
195196
sb.append(fontFamily);
196197
if (text != null) {
197198
sb.append("color:").append(toHexColor(text)).append(";");
@@ -207,6 +208,9 @@ private String getStyle(boolean isTag) {
207208

208209
private String toHexColor(Color color) {
209210
DecimalFormat df = new DecimalFormat("0.00");
211+
DecimalFormatSymbols dfs = new DecimalFormatSymbols();
212+
dfs.setDecimalSeparator('.');
213+
df.setDecimalFormatSymbols(dfs);
210214
return String.format("rgba(%s,%s,%s,%s)", color.getRed(), color.getGreen(), color.getBlue(), df.format(color.getAlpha() / (float) 255));
211215
}
212216

src/main/java/com/shuzijun/leetcode/plugin/timer/TimerStatusBarWidgetProvider.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.shuzijun.leetcode.plugin.timer;
22

33
import com.intellij.openapi.project.Project;
4-
import com.intellij.openapi.util.Disposer;
54
import com.intellij.openapi.wm.StatusBar;
65
import com.intellij.openapi.wm.StatusBarWidget;
76
import com.intellij.openapi.wm.StatusBarWidgetFactory;
@@ -16,7 +15,6 @@
1615
*/
1716
public class TimerStatusBarWidgetProvider implements StatusBarWidgetFactory {
1817

19-
private TimerBarWidget timerBarWidget;
2018

2119
@Override
2220
public @NonNls @NotNull String getId() {
@@ -35,21 +33,15 @@ public boolean isAvailable(@NotNull Project project) {
3533

3634
@Override
3735
public @NotNull StatusBarWidget createWidget(@NotNull Project project) {
38-
if (timerBarWidget == null) {
39-
timerBarWidget = new TimerBarWidget(project);
40-
}
41-
return timerBarWidget;
36+
return new TimerBarWidget(project);
4237
}
4338

4439
@Override
4540
public void disposeWidget(@NotNull StatusBarWidget widget) {
46-
if (timerBarWidget != null) {
47-
Disposer.dispose(timerBarWidget);
48-
}
4941
}
5042

5143
@Override
5244
public boolean canBeEnabledOn(@NotNull StatusBar statusBar) {
53-
return false;
45+
return true;
5446
}
5547
}

0 commit comments

Comments
 (0)