Skip to content

Commit 03f9a0d

Browse files
committed
修复全屏一些问题、自定义格式支持文字换行 - 20241125
1 parent af1d1e3 commit 03f9a0d

File tree

8 files changed

+85
-50
lines changed

8 files changed

+85
-50
lines changed

Assets/SettingUI.png

-97 Bytes
Loading

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
- [x] 自定义时间显示格式
1717
- [x] 支持通过组策略配置策略
1818
- [x] 支持保存你的设置
19+
- [x] 适配DPI缩放(适配高分屏)
1920
- [x] 其它一些功能。它们正在等待被你发现……
2021

2122
## 下载

Src/TimeControl.suo

512 Bytes
Binary file not shown.

Src/TimeControl/Form1.vb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,9 @@ Public Class Form1
15071507
Me.BackgroundImage = Nothing
15081508
End If
15091509
'End If
1510-
Opacity = 1
1510+
If TimeTheme = 0 Or 1 Then
1511+
Opacity = 1
1512+
End If
15111513
Me.FullM.Text = "退出全屏"
15121514
Else
15131515
Me.WindowState = FormWindowState.Normal
@@ -1520,7 +1522,7 @@ Public Class Form1
15201522
Else
15211523
Me.BackgroundImage = My.Resources.bkgdark
15221524
End If
1523-
'Me.TransparencyKey = Color.FromArgb(1, 1, 1)
1525+
Me.TransparencyKey = Color.FromArgb(1, 1, 1)
15241526
Opacity = 0.99
15251527
Else
15261528
If Me.Width >= 250 Then
@@ -1530,7 +1532,7 @@ Public Class Form1
15301532
Else
15311533
Me.BackgroundImage = My.Resources.bkg
15321534
End If
1533-
'Me.TransparencyKey = Color.FromArgb(184, 184, 184)
1535+
Me.TransparencyKey = Color.FromArgb(184, 184, 184)
15341536
Opacity = 0.99
15351537
End If
15361538
ElseIf TimeTheme = 1 Then

Src/TimeControl/Form2.Designer.vb

Lines changed: 44 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Src/TimeControl/Form2.resx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<data name="PictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
128128
<value>
129129
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
130-
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADsAAAA7AAWrWiQkAAAB7SURBVDhPxZHRCYAwDAU7jiM4
130+
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAADr8AAA6/ATgFUyQAAAB7SURBVDhPxZHRCYAwDAU7jiM4
131131
mFO4kXM4UPQhD8xL0ip+WDiwIXcUbGYWmJbNMnQPhAEW53VPySJO7MmEe2lAl3l0HgKVnH0TRoZyNXsV
132132
0DuBmwaUT4FKBv8G4J2n/o0jXKAXwdEZZeACT17CvRAgVUhF4i53KFTihbUD0860AyUhweoAAAAASUVO
133133
RK5CYII=
@@ -139,7 +139,7 @@
139139
<data name="PictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
140140
<value>
141141
iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1
142-
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACw8AAAsPAZL5A6UAAAzwSURBVHhe1ZvZdhXVFobzCL6B
142+
MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACw4AAAsOAUC+4UEAAAzwSURBVHhe1ZvZdhXVFobzCL6B
143143
vMnhDQ5vcHLlpeFOuUruvIQ77DAqYIcYbLAZQ40iDFCUOGyGDcIWxF6zsW9ZdeY3mf9y1tq1Q5CAWGN8
144144
Y85VCcn+5lxVtapSzFztbWlpaZMx+8QTT2w3lh5//PEVY2R0RonYHThwYGSsGPbtSwv2vf/l38aP+Xdt
145145
9uH/gzCiFl1QMUDcMeE6JgcTr9h4ZHHR2Bw//vrc7APe8OSTT86byNhka2czEsy5CNmaNxTiY489Ntq/
@@ -198,6 +198,9 @@
198198
fWYAAAAASUVORK5CYII=
199199
</value>
200200
</data>
201+
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
202+
<value>50</value>
203+
</metadata>
201204
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
202205
<value>
203206
AAABAAgAAAAAAAAAAAChhgAAhgAAAEBAAAAAAAAAKEIAACeHAAAwMAAAAAAAAKglAABPyQAAKCgAAAAA

Src/TimeControl/Form2.vb

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,6 +1399,23 @@ errcode:
13991399
End Try
14001400
End Sub
14011401

1402+
Private Sub PictureBox2_Click(sender As System.Object, e As System.EventArgs) Handles PictureBox2.Click
1403+
If Label3.Text = "设置时间小工具" Then
1404+
Dim a(5) As String
1405+
a(0) = "^_^"
1406+
a(1) = "ahhhhhhhhh?"
1407+
a(2) = "Let's have a try!"
1408+
a(3) = "The quick fox jumps over the lazy brown dog"
1409+
a(4) = "?????????????????"
1410+
a(5) = "Undefine string"
1411+
Dim b As New Random
1412+
Dim c As Integer = b.Next(0, 5)
1413+
Label3.Text = a(c)
1414+
Else
1415+
Label3.Text = "设置时间小工具"
1416+
End If
1417+
End Sub
1418+
14021419
Private Sub ComboBox4_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles ComboBox4.SelectedIndexChanged
14031420
If ComboBox4.SelectedIndex = 0 Then
14041421
If Form1.UnSaveData = 0 Then
@@ -1417,7 +1434,12 @@ errcode:
14171434
End If
14181435
Label17.Text = "99%"
14191436
TrackBar1.Value = 99
1420-
Form1.Opacity = 0.99
1437+
If Form1.WindowState = FormWindowState.Normal Then
1438+
Form1.Opacity = 0.99
1439+
Else
1440+
Form1.Opacity = 1
1441+
End If
1442+
14211443
ElseIf ComboBox4.SelectedIndex = 1 Then
14221444
If Form1.UnSaveData = 0 Then
14231445
RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeTheme", 1, RegistryValueKind.DWord, "HKCU")
@@ -1436,7 +1458,11 @@ errcode:
14361458
Label17.Text = "70%"
14371459
TrackBar1.Value = 70
14381460
Form1.BackgroundImage = Nothing
1439-
Form1.Opacity = 0.7
1461+
If Form1.WindowState = FormWindowState.Normal Then
1462+
Form1.Opacity = 0.7
1463+
Else
1464+
Form1.Opacity = 1
1465+
End If
14401466
ElseIf ComboBox4.SelectedIndex = 2 Then
14411467
If Form1.UnSaveData = 0 Then
14421468
RegKeyModule.AddReg("Software\CJH\TimeControl\Settings", "TimeTheme", 2, RegistryValueKind.DWord, "HKCU")

Src/TimeControl/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' 方法是按如下所示使用“*”:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("1.1.22.24112")>
35-
<Assembly: AssemblyFileVersion("1.1.22.24112")>
34+
<Assembly: AssemblyVersion("1.1.23.24113")>
35+
<Assembly: AssemblyFileVersion("1.1.23.24113")>

0 commit comments

Comments
 (0)