Optimized the display effect

Lssg97 · Jun 25, 2021 · d4c098c · d4c098c
1 parent f426120
commit d4c098c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/Documents/History.md b/Documents/History.md
@@ -2,9 +2,14 @@
 
 
 
+#### 2021年6月25日
+
+<img src="https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic" alt="优化" align="top" height="24" />　　优化无分页文件计算机，及仅有系统盘分区计算机的显示效果。
+
+
 #### 2021年6月24日
 
-<img src="https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic" alt="优化" align="top" height="24" />　　增加对非“C:\”盘符系统盘的识别，及优化仅有系统盘分区计算机的显示内容。
+<img src="https://img.shields.io/badge/-%E4%BC%98%E5%8C%96-green?style=plastic" alt="优化" align="top" height="24" />　　增加对非“C”盘符系统盘的识别。
 
 
 #### 2021年6月9日

diff --git a/Skin/DetailedSystemMonitor.ini b/Skin/DetailedSystemMonitor.ini
@@ -11,7 +11,7 @@ Name=
 Author=��ɫ���� (camusice)
 Information=���ϵͳ���磬CPU��GPU���ڴ棬Ӳ�̵�ϵͳ��Ϣ��
 License=CC BY-NC-SA 3.0
-Version=v 3.4 Beta (210624)
+Version=v 3.4 Beta (210625)
 
 [Variables]
 
@@ -64,7 +64,7 @@ fontColour4=255,0,0
 
 ;==================[�̳нڵ�]==================
 
-Release=210624
+Release=210625
 IntegratedGPUName=""
 DiscreteGPUName=""
 
@@ -7318,6 +7318,7 @@ Formula=MeasureVRAMTotalSource
 UpdateDivider=-1
 DynamicVariables=1
 Group=Win10
+Substitute="k":"K"
 
 [MeasureVRAMUsedSource]
 Measure=Plugin
@@ -7345,6 +7346,7 @@ Formula=MeasureVRAMTotal-MeasureVRAMUsed
 MaxValue=[MeasureVRAMTotal]
 DynamicVariables=1
 Group=Win10
+Substitute="k":"K"
 
 [MeasureAMDVRAMUsed]
 Measure=Plugin
@@ -7368,6 +7370,7 @@ IfAboveValue=0
 IfAboveValue=[!SetOption MeterVRAMFree Text "- %1"][!UpdateMeter MeterVRAMFree][!Redraw]
 IfBelowValue=0
 IfBelowAction=[!SetOption MeterVRAMFree Text "- 0.0 B"][!UpdateMeter MeterVRAMFree][!Redraw]
+Substitute="k":"K"
 
 [MeterVRAMBarContainer]
 Meter=Shape
@@ -7503,8 +7506,11 @@ Substitute="k":"K"
 
 [MeasurePageTotal]
 Measure=Calc
-Formula=MeasureSwapTotal-MeasureRAMTotal
+Formula=Max(MeasureSwapTotal-MeasureRAMTotal,0)
 UpdateDivider=60
+IfCondition=#CURRENTSECTION# = 0
+IfTrueAction=[!DisableMeasure MeasurePageUsedPercentual][!DisableMeasure MeasurePageUsed][!DisableMeasure MeasurePageFree][!HideMeter MeterPageTotal][!HideMeter MeterPageUsedPercentual][!HideMeter MeterPageFree][!SetOption MeterRAMTotal Y (ceil(#zoom#*49))r][!SetOption MeterRAMTotal FontSize (#zoom#*7)][!SetOption MeterRAMFree X 0r][!SetOption MeterRAMFree Y 0r][!SetOption MeterRAMTopText Y (#zoom#*41)r][!UpdateMeter MeterRAMTotal][!UpdateMeter MeterRAMFree][!UpdateMeter MeterRAMTopText][!Redraw]
+IfFalseAction=[!EnableMeasure MeasurePageUsedPercentual][!EnableMeasure MeasurePageUsed][!EnableMeasure MeasurePageFree]
 Substitute="k":"K"
 
 [MeasurePageUsedPercentual]
@@ -8565,8 +8571,10 @@ Measure=Calc
 Formula=MeasureDiskTotal-Measure[MeasureDiskAlto]Total
 UpdateDivider=-1
 IfCondition=#CURRENTSECTION# = 0
-IfTrueAction=[!DisableMeasure MeasureDiskExceptSysUsed][!DisableMeasure MeasureDiskExceptSysFree][!HideMeter MeterDiskExceptSysTotal][!HideMeter MeterDiskExceptSysPercentual][!HideMeter MeterDiskExceptSysFree][!SetOption MeterSysDiskTotal Y (#zoom#*49)r][!SetOption MeterSysDiskTotal FontSize (#zoom#*7)][!SetOption MeterSysDiskPercentual Y (#zoom#*18)r][!SetOption MeterSysDiskFree X 0r][!SetOption MeterSysDiskFree Y 0r][!SetOption MeterDiskReadText Y (#zoom#*22)r][!UpdateMeter MeterSysDiskTotal][!UpdateMeter MeterSysDiskPercentual][!UpdateMeter MeterSysDiskFree][!UpdateMeter MeterDiskReadText][!Redraw]
+IfTrueAction=[!DisableMeasure MeasureDiskExceptSysUsed][!DisableMeasure MeasureDiskExceptSysFree][!HideMeter MeterDiskExceptSysTotal][!HideMeter MeterDiskExceptSysUsedPercentual][!HideMeter MeterDiskExceptSysFree][!SetOption MeterSysDiskTotal Y (ceil(#zoom#*49))r][!SetOption MeterSysDiskTotal FontSize (#zoom#*7)][!SetOption MeterSysDiskFree X 0r][!SetOption MeterSysDiskFree Y 0r][!SetOption MeterDiskReadText Y (#zoom#*22)r][!UpdateMeter MeterSysDiskTotal][!UpdateMeter MeterSysDiskFree][!UpdateMeter MeterDiskReadText][!Redraw]
 IfFalseAction=[!EnableMeasure MeasureDiskExceptSysUsed][!EnableMeasure MeasureDiskExceptSysFree]
+IfCondition2=#CURRENTSECTION#+MeasurePageTotal=0
+IfTrueAction2=[!SetOption MeterRAMUsedPercentual Y (#zoom#*13)r][!SetOption MeterRAMTopText Y (#zoom#*36)r][!SetOption ImageDisk Y (#zoom#*-90)r][!SetOption MeterSysDiskUsedPercentual Y (#zoom#*13)r][!SetOption MeterDiskReadText Y (#zoom#*17)r][!Redraw]
 Substitute="k":"K"
 
 [MeasureDiskExceptSysUsed]
@@ -9101,7 +9109,7 @@ SolidColor=#fontColour#,1
 AntiAlias=1
 ToolTipText="�û��洢����"
 
-[MeterSysDiskPercentual]
+[MeterSysDiskUsedPercentual]
 Meter=String
 MeasureName=Measure[MeasureDiskAlto]Used
 Text="%1 %"
@@ -9118,7 +9126,7 @@ SolidColor=#fontColour2#,1
 AntiAlias=1
 ToolTipText="ϵͳ�洢ʹ����"
 
-[MeterDiskExceptSysPercentual]
+[MeterDiskExceptSysUsedPercentual]
 Meter=String
 MeasureName=MeasureDiskExceptSysUsed
 Text="%1 %"