Skip to content

Commit 300fbbd

Browse files
Pigeon0v0Pigeon0v0
authored
Merge pull request PCL-Community#174 from 9223372036854775807-Studio/main
2 parents a530d8d + 71f1527 commit 300fbbd

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

‎Plain Craft Launcher 2/Controls/MyCard.vb

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Public Class MyCard
7171
MainChrome = New SystemDropShadowChrome With {.Margin = New Thickness(-9.5, -9, 0.5, -0.5), .Opacity = 0.1, .CornerRadius = New CornerRadius(6)}
7272
MainChrome.SetResourceReference(SystemDropShadowChrome.ColorProperty, "ColorObject1")
7373
Children.Insert(0, MainChrome)
74-
MainBorder = New Border With {.Background = New SolidColorBrush(Color.FromArgb(IIf(IsDarkMode, 235, 205), IIf(IsDarkMode, 43, 255), IIf(IsDarkMode, 43, 255), IIf(IsDarkMode, 43, 255))), .CornerRadius = New CornerRadius(6), .IsHitTestVisible = False}
74+
MainBorder = New Border With {.Background = New SolidColorBrush(Color.FromArgb(If(IsDarkMode, 235, 205), If(IsDarkMode, 43, 255), If(IsDarkMode, 43, 255), If(IsDarkMode, 43, 255))), .CornerRadius = New CornerRadius(6), .IsHitTestVisible = False}
7575
Children.Insert(1, MainBorder)
7676
MainGrid = New Grid
7777
Children.Add(MainGrid)
@@ -129,7 +129,7 @@ Public Class MyCard
129129
If Not IsNothing(MainSwap) Then AniList.Add(AaColor(MainSwap, Shapes.Path.FillProperty, "ColorBrush2", 150))
130130
AniList.AddRange({
131131
AaColor(MainChrome, SystemDropShadowChrome.ColorProperty, "ColorObject2", 180),
132-
AaColor(MainBorder, Border.BackgroundProperty, New MyColor(IIf(IsDarkMode, 245, 230), IIf(IsDarkMode, 48, 255), IIf(IsDarkMode, 48, 255), IIf(IsDarkMode, 48, 255)) - MainBorder.Background, 180),
132+
AaColor(MainBorder, Border.BackgroundProperty, New MyColor(If(IsDarkMode, 245, 230), If(IsDarkMode, 48, 255), If(IsDarkMode, 48, 255), If(IsDarkMode, 48, 255)) - MainBorder.Background, 180),
133133
AaOpacity(MainChrome, 0.3 - MainChrome.Opacity, 180)
134134
})
135135
If Not IsThemeChanging Then AniStart(AniList, "MyCard Mouse " & Uuid)
@@ -141,7 +141,7 @@ Public Class MyCard
141141
If Not IsNothing(MainSwap) Then AniList.Add(AaColor(MainSwap, Shapes.Path.FillProperty, "ColorBrush1", 250))
142142
AniList.AddRange({
143143
AaColor(MainChrome, SystemDropShadowChrome.ColorProperty, "ColorObject1", 300),
144-
AaColor(MainBorder, Border.BackgroundProperty, New MyColor(IIf(IsDarkMode, 235, 205), IIf(IsDarkMode, 43, 255), IIf(IsDarkMode, 43, 255), IIf(IsDarkMode, 43, 255)) - MainBorder.Background, 300),
144+
AaColor(MainBorder, Border.BackgroundProperty, New MyColor(If(IsDarkMode, 235, 205), If(IsDarkMode, 43, 255), If(IsDarkMode, 43, 255), If(IsDarkMode, 43, 255)) - MainBorder.Background, 300),
145145
AaOpacity(MainChrome, 0.1 - MainChrome.Opacity, 300)
146146
})
147147
If Not IsThemeChanging Then AniStart(AniList, "MyCard Mouse " & Uuid)

‎Plain Craft Launcher 2/Controls/MyHint.xaml.vb

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
If Type = HintType.Note Then
109109
If IsWarn Then
110110
BorderBrush = New MyColor("#CCFF4444")
111-
Gradient1.Color = New MyColor(CType(IIf(IsDarkMode, "#BBFF8888", "#BBFFBBBB"), String))
112-
Gradient2.Color = New MyColor(CType(IIf(IsDarkMode, "#BBFF6666", "#BBFF8888"), String))
111+
Gradient1.Color = New MyColor(CType(If(IsDarkMode, "#BBFF8888", "#BBFFBBBB"), String))
112+
Gradient2.Color = New MyColor(CType(If(IsDarkMode, "#BBFF6666", "#BBFF8888"), String))
113113
Path.Fill = New MyColor("#BF0000")
114114
LabText.Foreground = New MyColor("#BF0000")
115115
BtnClose.Foreground = New MyColor("#BF0000")
@@ -139,8 +139,8 @@
139139
Return
140140
Case HintType.Caution
141141
BorderBrush = New MyColor("#CCFF4444")
142-
Gradient1.Color = New MyColor(CType(IIf(IsDarkMode, "#BBFF8888", "#BBFFBBBB"), String))
143-
Gradient2.Color = New MyColor(CType(IIf(IsDarkMode, "#BBFF6666", "#BBFF8888"), String))
142+
Gradient1.Color = New MyColor(CType(If(IsDarkMode, "#BBFF8888", "#BBFFBBBB"), String))
143+
Gradient2.Color = New MyColor(CType(If(IsDarkMode, "#BBFF6666", "#BBFF8888"), String))
144144
Path.Fill = New MyColor("#BF0000")
145145
LabText.Foreground = New MyColor("#BF0000")
146146
BtnClose.Foreground = New MyColor("#BF0000")

‎Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Public Class MyLocalModItem
7171
"<Border xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
7272
Background=""#0C000000"" Padding=""3,1"" CornerRadius=""3"" Margin=""0,0,3,0""
7373
SnapsToDevicePixels=""True"" UseLayoutRounding=""False"">
74-
<TextBlock Text=""" & TagText & """ Foreground=""" & IIf(IsDarkMode, "#88FFFFFF", "#88000000") & """ FontSize=""11"" />
74+
<TextBlock Text=""" & TagText & """ Foreground=""" & If(IsDarkMode, "#88FFFFFF", "#88000000") & """ FontSize=""11"" />
7575
</Border>")
7676
PanTags.Children.Add(NewTag)
7777
Next

‎Plain Craft Launcher 2/Modules/ModSecret.vb

+25-16
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,16 @@ PCL-Community 及其成员与龙腾猫跃无从属关系，且均不会为您的
224224
Public ColorLight6 As New MyColor(213, 230, 253)
225225
Public ColorLight7 As New MyColor(222, 236, 253)
226226
Public ColorLight8 As New MyColor(234, 242, 254)
227-
Public Color1 As MyColor = IIf(IsDarkMode, ColorDark1, ColorLight1)
228-
'Public Color2 As MyColor = IIf(IsDarkMode, ColorDark2, ColorLight2)
229-
'Public Color3 As MyColor = IIf(IsDarkMode, ColorDark3, ColorLight3)
227+
Public Color1 As MyColor = If(IsDarkMode, ColorDark1, ColorLight1)
228+
'Public Color2 As MyColor = If(IsDarkMode, ColorDark2, ColorLight2)
229+
'Public Color3 As MyColor = If(IsDarkMode, ColorDark3, ColorLight3)
230230
Public Color2 As New MyColor(11, 91, 203)
231231
Public Color3 As New MyColor(19, 112, 243)
232232
Public Color4 As New MyColor(72, 144, 245)
233233
Public Color5 As New MyColor(150, 192, 249)
234-
Public Color6 As MyColor = IIf(IsDarkMode, ColorDark6, ColorLight6)
235-
Public Color7 As MyColor = IIf(IsDarkMode, ColorDark7, ColorLight7)
236-
Public Color8 As MyColor = IIf(IsDarkMode, ColorDark8, ColorLight8)
234+
Public Color6 As MyColor = If(IsDarkMode, ColorDark6, ColorLight6)
235+
Public Color7 As MyColor = If(IsDarkMode, ColorDark7, ColorLight7)
236+
Public Color8 As MyColor = If(IsDarkMode, ColorDark8, ColorLight8)
237237
Public ColorBg0 As New MyColor(150, 192, 249)
238238
Public ColorBg1 As New MyColor(190, Color7)
239239
Public ColorGrayDark1 As New MyColor(245, 245, 245)
@@ -252,18 +252,18 @@ PCL-Community 及其成员与龙腾猫跃无从属关系，且均不会为您的
252252
Public ColorGrayLight6 As New MyColor(235, 235, 235)
253253
Public ColorGrayLight7 As New MyColor(240, 240, 240)
254254
Public ColorGrayLight8 As New MyColor(245, 245, 245)
255-
Public ColorGray1 As MyColor = IIf(IsDarkMode, ColorGrayDark1, ColorGrayLight1)
256-
Public ColorGray2 As MyColor = IIf(IsDarkMode, ColorGrayDark2, ColorGrayLight2)
257-
Public ColorGray3 As MyColor = IIf(IsDarkMode, ColorGrayDark3, ColorGrayLight3)
258-
Public ColorGray4 As MyColor = IIf(IsDarkMode, ColorGrayDark4, ColorGrayLight4)
259-
Public ColorGray5 As MyColor = IIf(IsDarkMode, ColorGrayDark5, ColorGrayLight5)
260-
Public ColorGray6 As MyColor = IIf(IsDarkMode, ColorGrayDark6, ColorGrayLight6)
261-
Public ColorGray7 As MyColor = IIf(IsDarkMode, ColorGrayDark7, ColorGrayLight7)
262-
Public ColorGray8 As MyColor = IIf(IsDarkMode, ColorGrayDark8, ColorGrayLight8)
255+
Public ColorGray1 As MyColor = If(IsDarkMode, ColorGrayDark1, ColorGrayLight1)
256+
Public ColorGray2 As MyColor = If(IsDarkMode, ColorGrayDark2, ColorGrayLight2)
257+
Public ColorGray3 As MyColor = If(IsDarkMode, ColorGrayDark3, ColorGrayLight3)
258+
Public ColorGray4 As MyColor = If(IsDarkMode, ColorGrayDark4, ColorGrayLight4)
259+
Public ColorGray5 As MyColor = If(IsDarkMode, ColorGrayDark5, ColorGrayLight5)
260+
Public ColorGray6 As MyColor = If(IsDarkMode, ColorGrayDark6, ColorGrayLight6)
261+
Public ColorGray7 As MyColor = If(IsDarkMode, ColorGrayDark7, ColorGrayLight7)
262+
Public ColorGray8 As MyColor = If(IsDarkMode, ColorGrayDark8, ColorGrayLight8)
263263
Public ColorSemiTransparent As New MyColor(1, Color8)
264264

265265
Public ThemeNow As Integer = -1
266-
'Public ColorHue As Integer = IIf(IsDarkMode, 200, 210), ColorSat As Integer = IIf(IsDarkMode, 100, 85), ColorLightAdjust As Integer = IIf(IsDarkMode, 15, 0), ColorHueTopbarDelta As Object = 0
266+
'Public ColorHue As Integer = If(IsDarkMode, 200, 210), ColorSat As Integer = If(IsDarkMode, 100, 85), ColorLightAdjust As Integer = If(IsDarkMode, 15, 0), ColorHueTopbarDelta As Object = 0
267267
Public ColorHue As Integer = 210, ColorSat As Integer = 85, ColorLightAdjust As Integer = 0, ColorHueTopbarDelta As Object = 0
268268
Public ThemeDontClick As Integer = 0
269269

@@ -280,6 +280,15 @@ PCL-Community 及其成员与龙腾猫跃无从属关系，且均不会为您的
280280
Public Sub ThemeRefresh(Optional NewTheme As Integer = -1)
281281
RaiseThemeChanged(IsDarkMode)
282282

283+
ColorGray1 = If(IsDarkMode, ColorGrayDark1, ColorGrayLight1)
284+
ColorGray2 = If(IsDarkMode, ColorGrayDark2, ColorGrayLight2)
285+
ColorGray3 = If(IsDarkMode, ColorGrayDark3, ColorGrayLight3)
286+
ColorGray4 = If(IsDarkMode, ColorGrayDark4, ColorGrayLight4)
287+
ColorGray5 = If(IsDarkMode, ColorGrayDark5, ColorGrayLight5)
288+
ColorGray6 = If(IsDarkMode, ColorGrayDark6, ColorGrayLight6)
289+
ColorGray7 = If(IsDarkMode, ColorGrayDark7, ColorGrayLight7)
290+
ColorGray8 = If(IsDarkMode, ColorGrayDark8, ColorGrayLight8)
291+
283292
If IsDarkMode Then
284293
Application.Current.Resources("ColorBrush1") = New SolidColorBrush(ColorDark1)
285294
'Application.Current.Resources("ColorBrush2") = New SolidColorBrush(ColorDark2)
@@ -377,7 +386,7 @@ PCL-Community 及其成员与龙腾猫跃无从属关系，且均不会为您的
377386
Brush.GradientStops.Add(New GradientStop With {.Offset = 1.1, .Color = New MyColor().FromHSL2(ColorHue + 20, Math.Min(60, ColorSat) * 0.5, GetDarkThemeLight(80))})
378387
FrmMain.PanForm.Background = Brush
379388
Else
380-
FrmMain.PanForm.Background = New MyColor(IIf(IsDarkMode, 20, 245), IIf(IsDarkMode, 20, 245), IIf(IsDarkMode, 20, 245))
389+
FrmMain.PanForm.Background = New MyColor(If(IsDarkMode, 20, 245), If(IsDarkMode, 20, 245), If(IsDarkMode, 20, 245))
381390
End If
382391
FrmMain.PanForm.Background.Freeze()
383392
End Sub)

0 commit comments

Comments
 (0)