Compare commits

...

2 Commits

Author SHA1 Message Date
Jonathan Jenne
3ce46b2884 Version 2.3.9.8 2021-04-21 14:35:44 +02:00
Jonathan Jenne
114e459577 Fix Scaling Factor calculation 2021-04-21 14:35:33 +02:00
2 changed files with 8 additions and 3 deletions

View File

@@ -15,7 +15,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")> <Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Global Indexer")> <Assembly: AssemblyProduct("Global Indexer")>
<Assembly: AssemblyCopyright("Copyright © 2021")> <Assembly: AssemblyCopyright("Copyright © 2021")>
<Assembly: AssemblyTrademark("2397")> <Assembly: AssemblyTrademark("2398")>
<Assembly: ComVisible(False)> <Assembly: ComVisible(False)>
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.3.9.7")> <Assembly: AssemblyVersion("2.3.9.8")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")> <Assembly: NeutralResourcesLanguageAttribute("")>

View File

@@ -1540,6 +1540,7 @@ Public Class frmIndex
ShowErrorMessage(ex, "Form Open") ShowErrorMessage(ex, "Form Open")
End Try End Try
End Sub End Sub
Sub Load_String() Sub Load_String()
Try Try
Me.VWDDINDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString Me.VWDDINDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString
@@ -1718,11 +1719,15 @@ Public Class frmIndex
Private Sub LoadIndexe_Man() Private Sub LoadIndexe_Man()
Try Try
Dim oDpiscale = DigitalData.Modules.Windows.Screen.GetScalingFactor() Dim oScreen As New DigitalData.Modules.Windows.Screen()
Dim oDpiscale = oScreen.GetScreenScaling(Me)
Dim oControlCount As Integer = 1 Dim oControlCount As Integer = 1
Dim oLabelPosition As Integer = 11 * oDpiscale Dim oLabelPosition As Integer = 11 * oDpiscale
Dim oControlPosition As Integer = 33 * oDpiscale Dim oControlPosition As Integer = 33 * oDpiscale
_Logger.Info("Loading Indicies for Screen Scaling Factor [{0}]", oDpiscale)
Dim oControls As New ControlCreator(LOGCONFIG, pnlIndex, Me) With { Dim oControls As New ControlCreator(LOGCONFIG, pnlIndex, Me) With {
.OnControlChanged = AddressOf PrepareDependingControl, .OnControlChanged = AddressOf PrepareDependingControl,
.OnLookupData = AddressOf GetLookupData .OnLookupData = AddressOf GetLookupData