position result window below search

This commit is contained in:
Jonathan Jenne 2020-11-11 17:02:31 +01:00
parent 9bfd7f9213
commit 2c9917bbf5
2 changed files with 30 additions and 9 deletions

View File

@ -62,6 +62,10 @@ Public Class frmDocumentResultList
SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance
SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal
If _IsLegacy = True Then
RibbonPageGroupNavigation.Visible = True
Else
' Location and size will be managed by the ZooFlow Search Window
If Utils.IsVisibleOnAnyScreen(_Config.Config.WindowLocation) Then If Utils.IsVisibleOnAnyScreen(_Config.Config.WindowLocation) Then
If Utils.LocationIsVisible(_Config.Config.WindowLocation) Then If Utils.LocationIsVisible(_Config.Config.WindowLocation) Then
Location = _Config.Config.WindowLocation Location = _Config.Config.WindowLocation
@ -71,9 +75,6 @@ Public Class frmDocumentResultList
End If End If
End If End If
If _IsLegacy = True Then
RibbonPageGroupNavigation.Visible = True
Else
RibbonPageGroupNavigation.Visible = False RibbonPageGroupNavigation.Visible = False
End If End If

View File

@ -829,15 +829,35 @@ Public Class frmSearchStart
Dim oForm As New frmDocumentResultList(My.LogConfig, oEnvironment, oParams) Dim oForm As New frmDocumentResultList(My.LogConfig, oEnvironment, oParams)
oForm.Show() oForm.Show()
' Position Result Window below this window
oForm.Location = GetResultFormLocation()
oForm.Size = GetResultFormSize()
Else Else
Display_InfoItem("No results for this searchcombination!", Color.OrangeRed) Display_InfoItem("No results for this searchcombination!", Color.OrangeRed)
End If End If
Catch ex As Exception Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, Text)
Finally Finally
SplashScreenManager.CloseOverlayForm(oHandle) SplashScreenManager.CloseOverlayForm(oHandle)
End Try End Try
End Sub End Sub
Private Function GetResultFormLocation() As Point
Dim oX = Location.X
Dim oY = Location.Y + Size.Height
Return New Point(oX, oY)
End Function
Private Function GetResultFormSize() As Size
Dim oWidth = Size.Width
' TODO: Smarter height calculation, maybe depending on screen height and parent form location
Dim oHeight = 400
Return New Size(oWidth, oHeight)
End Function
Private Sub frmSearchStart_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp Private Sub frmSearchStart_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
If e.KeyCode = Keys.F2 Then If e.KeyCode = Keys.F2 Then
Start_Search() Start_Search()