From 9a6e2a7b86c274f63af5f2c45a592aef7786f898 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 15 Jun 2020 10:37:30 +0200 Subject: [PATCH] fix zoom display --- .../DocumentViewer.Designer.vb | 14 +++--- Controls.DocumentViewer/DocumentViewer.vb | 47 ++++++++++--------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 895e1d6f..5a098dc6 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -38,7 +38,7 @@ Partial Class DocumentViewer Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator() Me.btnFirstPage = New System.Windows.Forms.ToolStripButton() Me.btnPreviousPage = New System.Windows.Forms.ToolStripButton() - Me.tbCurrentPage = New System.Windows.Forms.ToolStripTextBox() + Me.txtCurrentPage = New System.Windows.Forms.ToolStripTextBox() Me.lblPageCount = New System.Windows.Forms.ToolStripLabel() Me.btnNextPage = New System.Windows.Forms.ToolStripButton() Me.btnLastPage = New System.Windows.Forms.ToolStripButton() @@ -136,7 +136,7 @@ Partial Class DocumentViewer Me.mainToolStrip.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.mainToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.mainToolStrip.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.mainToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnPrint, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator2, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.tbCurrentPage, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator5, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnSettings}) + Me.mainToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnPrint, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator2, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.txtCurrentPage, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator5, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnSettings}) Me.mainToolStrip.Location = New System.Drawing.Point(0, 0) Me.mainToolStrip.Name = "mainToolStrip" Me.mainToolStrip.Size = New System.Drawing.Size(1015, 31) @@ -254,10 +254,10 @@ Partial Class DocumentViewer ' 'tbCurrentPage ' - Me.tbCurrentPage.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.tbCurrentPage.Name = "tbCurrentPage" - Me.tbCurrentPage.Size = New System.Drawing.Size(40, 31) - Me.tbCurrentPage.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Right + Me.txtCurrentPage.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtCurrentPage.Name = "tbCurrentPage" + Me.txtCurrentPage.Size = New System.Drawing.Size(40, 31) + Me.txtCurrentPage.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Right ' 'lblPageCount ' @@ -438,7 +438,7 @@ Partial Class DocumentViewer Friend WithEvents ToolStripSeparator6 As ToolStripSeparator Friend WithEvents btnFirstPage As ToolStripButton Friend WithEvents btnPreviousPage As ToolStripButton - Friend WithEvents tbCurrentPage As ToolStripTextBox + Friend WithEvents txtCurrentPage As ToolStripTextBox Friend WithEvents lblPageCount As ToolStripLabel Friend WithEvents btnNextPage As ToolStripButton Friend WithEvents btnLastPage As ToolStripButton diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index e0cd5783..5fac9b84 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -323,7 +323,7 @@ Public Class DocumentViewer btnPrint.Enabled = False btnFirstPage.Enabled = False btnPreviousPage.Enabled = False - tbCurrentPage.Enabled = False + txtCurrentPage.Enabled = False lblPageCount.Enabled = False btnNextPage.Enabled = False btnLastPage.Enabled = False @@ -336,14 +336,14 @@ Public Class DocumentViewer btnRotateRight.Enabled = False btnFlipX.Enabled = False btnFlipY.Enabled = False - tbCurrentPage.Text = "0" + txtCurrentPage.Text = "0" lblPageCount.Text = "/ 0" cbZoom.SelectedIndex = -1 Else btnPrint.Enabled = True btnFirstPage.Enabled = True btnPreviousPage.Enabled = True - tbCurrentPage.Enabled = True + txtCurrentPage.Enabled = True lblPageCount.Enabled = True btnNextPage.Enabled = True btnLastPage.Enabled = True @@ -376,9 +376,9 @@ Public Class DocumentViewer GdViewer.DisplayLastPage() End Sub - Private Sub tbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles tbCurrentPage.Leave + Private Sub tbCurrentPage_Leave(ByVal sender As System.Object, ByVal e As EventArgs) Handles txtCurrentPage.Leave Dim page As Integer = 0 - If Integer.TryParse(tbCurrentPage.Text, page) Then + If Integer.TryParse(txtCurrentPage.Text, page) Then If page > 0 And page <= GdViewer.PageCount Then GdViewer.DisplayPage(page) UpdateaNavigationToolbar() @@ -565,24 +565,25 @@ Public Class DocumentViewer End Sub Private Sub UpdateaNavigationToolbar() - Dim currentPage As Integer = GdViewer.CurrentPage() - tbCurrentPage.Text = currentPage.ToString() - lblPageCount.Text = "/ " & GdViewer.PageCount.ToString() - If currentPage = 1 Then - btnFirstPage.Enabled = False - btnPreviousPage.Enabled = False - Else - btnFirstPage.Enabled = True - btnPreviousPage.Enabled = True - End If - If currentPage = GdViewer.PageCount Then - btnNextPage.Enabled = False - btnLastPage.Enabled = False - Else - btnNextPage.Enabled = True - btnLastPage.Enabled = True - End If - cbZoom.Text = String.Format(CultureInfo.InvariantCulture, "{0:#0.##%}", GdViewer.Zoom) + Try + Dim oCurrentZoom As Double = GdViewer.Zoom + Dim oCurrentPage As Integer = GdViewer.CurrentPage() + Dim oPageCount As Integer = GdViewer.PageCount + txtCurrentPage.Text = oCurrentPage.ToString() + lblPageCount.Text = "/ " & GdViewer.PageCount.ToString() + + If oCurrentPage = 1 Or oCurrentPage = oPageCount Then + btnFirstPage.Enabled = False + btnPreviousPage.Enabled = False + Else + btnFirstPage.Enabled = True + btnPreviousPage.Enabled = True + End If + + cbZoom.Text = String.Format(format:="{0:#0.##%}", arg0:=oCurrentZoom) + Catch ex As Exception + _logger.Error(ex) + End Try End Sub Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitWidth.Click