Skip to content

Commit 5e379f4

Browse files
JockeJarreJockeJarre
committed
Merge solution files into one
1 parent dd3234b commit 5e379f4

File tree

4 files changed

+17
-39
lines changed

4 files changed

+17
-39
lines changed

‎.github/workflows/b2s-backglass.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ jobs:
8585
msbuild b2s_screenresidentifier/B2S_ScreenResIdentifier.sln /t:Rebuild /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
8686
msbuild b2sbackglassserver/B2SBackglassServerEXE.sln /t:Rebuild /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
8787
msbuild b2sbackglassserverregisterapp/B2SBackglassServerRegisterApp.sln /t:Rebuild /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
88-
msbuild b2sbackglassserver/B2SBackglassServer.sln /t:Rebuild /p:Configuration=${{ matrix.config }}
8988
msbuild B2SWindowPunch/B2SWindowPunch.sln /t:Rebuild /p:Configuration=${{ matrix.config }}
9089
shell: cmd
9190
- name: Bundle

‎b2sbackglassserver/B2SBackglassServer.sln‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎b2sbackglassserver/B2SBackglassServerEXE.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.4.33205.214
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "B2SBackglassServerEXE", "B2SBackglassServer\B2SBackglassServerEXE.vbproj", "{AC2E94BE-21CD-434A-9039-6551DF43698B}"
77
EndProject
8+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "B2SBackglassServer", "b2sbackglassserver\B2SBackglassServer.vbproj", "{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|x64 = Debug|x64
@@ -21,6 +23,14 @@ Global
2123
{AC2E94BE-21CD-434A-9039-6551DF43698B}.Release|x64.Build.0 = Release|x64
2224
{AC2E94BE-21CD-434A-9039-6551DF43698B}.Release|x86.ActiveCfg = Release|x86
2325
{AC2E94BE-21CD-434A-9039-6551DF43698B}.Release|x86.Build.0 = Release|x86
26+
{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}.Debug|x64.ActiveCfg = Debug|x64
27+
{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}.Debug|x64.Build.0 = Debug|x64
28+
{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}.Debug|x86.ActiveCfg = Debug|Any CPU
29+
{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}.Debug|x86.Build.0 = Debug|Any CPU
30+
{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}.Release|x64.ActiveCfg = Release|x64
31+
{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}.Release|x64.Build.0 = Release|x64
32+
{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}.Release|x86.ActiveCfg = Release|Any CPU
33+
{42A57D3D-5D76-4D46-9CF0-0909C7C799C4}.Release|x86.Build.0 = Release|Any CPU
2434
EndGlobalSection
2535
GlobalSection(SolutionProperties) = preSolution
2636
HideSolutionNode = FALSE

‎b2sbackglassserver/b2sbackglassserver/Classes/B2SScreen.vb‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Imports System.Text.RegularExpressions
66

77
Public Class B2SScreen
88

9-
Public Property ScreensOrdered() = Screen.AllScreens.OrderBy(Function(sc) sc.Bounds.Location.X).ToArray()
9+
Public Property ScreensOrdered() As Screen() = Screen.AllScreens.OrderBy(Function(sc) sc.Bounds.Location.X).ToArray()
1010
Public Property VersionTwoFile() As Boolean = False
1111

1212
Public Shared formBackglass As formBackglass = Nothing
@@ -39,7 +39,7 @@ Public Class B2SScreen
3939
Public Property BackgroundLocation() As Point = New Point(0, 0)
4040
Public Property BackgroundPath() As String = String.Empty
4141

42-
Public Property BackglassCutOff() As Rectangle = Nothing
42+
Public Property BackglassCutOff() As Rectangle = Rectangle.Empty
4343

4444
Public Property IsDMDToBeShown() As Boolean = False
4545
Public Property StartBackground() As Boolean = False
@@ -149,7 +149,7 @@ Public Class B2SScreen
149149
debugLog.WriteLogEntry("B2SScreen.ReadB2SSettingsFromFile A version #2 file " & Me.BackgroundPath)
150150

151151
line(i) = 0
152-
line(i + 1) = 0
152+
If i < 49 Then line(i + 1) = 0
153153

154154
Me.BackglassMonitor = line(4)
155155
EvalateBackglassScreen()
@@ -170,7 +170,7 @@ Public Class B2SScreen
170170
If (line(7).Contains("%") Or line(8).Contains("%")) Then debugLog.WriteLogEntry("B2SScreen.ReadB2SSettingsFromFile DMDSize: " &
171171
line(7) & "," & line(8) & "->" & Me.DMDSize.Width & "," & Me.DMDSize.Height)
172172

173-
Me.DMDLocation = New Size(CInt(CalcValue(line(9), Me.BackglassScreen.Bounds.Width)), CInt(CalcValue(line(10), Me.BackglassScreen.Bounds.Height)))
173+
Me.DMDLocation = New Point(CInt(CalcValue(line(9), Me.BackglassScreen.Bounds.Width)), CInt(CalcValue(line(10), Me.BackglassScreen.Bounds.Height)))
174174
If (line(9).Contains("%") Or line(10).Contains("%")) Then debugLog.WriteLogEntry("B2SScreen.ReadB2SSettingsFromFile DMDLocation: " &
175175
line(9) & "," & line(10) & "->" & Me.DMDLocation.X & "," & Me.DMDLocation.Y)
176176

@@ -638,16 +638,16 @@ Public Class B2SScreen
638638
If DMDFlipY AndAlso Not DMDAtDefaultLocation Then
639639
y = formDMD.Height / _rescaleDMDY - y - ledarea.Value.Rect.Height / _rescaleDMDY
640640
End If
641-
ledarea.Value.Rect = Rectangle.Round(New Rectangle(ledarea.Value.Rect.X / _rescaleDMDX, y, ledarea.Value.Rect.Width / _rescaleDMDX, ledarea.Value.Rect.Height / _rescaleDMDY))
641+
ledarea.Value.Rect = Rectangle.Round(New RectangleF(ledarea.Value.Rect.X / _rescaleDMDX, y, ledarea.Value.Rect.Width / _rescaleDMDX, ledarea.Value.Rect.Height / _rescaleDMDY))
642642
End If
643643
Else
644-
ledarea.Value.Rect = Rectangle.Round(New Rectangle(ledarea.Value.Rect.X / _rescaleX, ledarea.Value.Rect.Y / _rescaleY, ledarea.Value.Rect.Width / _rescaleX, ledarea.Value.Rect.Height / _rescaleY))
644+
ledarea.Value.Rect = Rectangle.Round(New RectangleF(ledarea.Value.Rect.X / _rescaleX, ledarea.Value.Rect.Y / _rescaleY, ledarea.Value.Rect.Width / _rescaleX, ledarea.Value.Rect.Height / _rescaleY))
645645
End If
646646
Next
647647

648648
' and now recalc the backglass cut off rectangle
649649
If BackglassCutOff <> Nothing Then
650-
BackglassCutOff = New Rectangle(BackglassCutOff.X / _rescaleX, BackglassCutOff.Y / _rescaleY, BackglassCutOff.Width / _rescaleX, BackglassCutOff.Height / _rescaleY)
650+
BackglassCutOff = Rectangle.Round(New RectangleF(BackglassCutOff.X / _rescaleX, BackglassCutOff.Y / _rescaleY, BackglassCutOff.Width / _rescaleX, BackglassCutOff.Height / _rescaleY))
651651
End If
652652

653653
End Sub

0 commit comments

Comments
 (0)