From 2f5e23adfb9ae292443cd36ab73096203b8b78c4 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sat, 17 Jul 2021 21:37:25 -0400 Subject: [PATCH] Fixed hex editor scroll bars to use proper page step. --- src/drivers/Qt/HexEditor.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/drivers/Qt/HexEditor.cpp b/src/drivers/Qt/HexEditor.cpp index 15199010..e852f8e2 100644 --- a/src/drivers/Qt/HexEditor.cpp +++ b/src/drivers/Qt/HexEditor.cpp @@ -1402,7 +1402,7 @@ HexEditorDialog_t::HexEditorDialog_t(QWidget *parent) hbar->setMinimum(0); hbar->setMaximum(100); vbar->setMinimum(0); - vbar->setMaximum( 0x10000 / 16 ); + vbar->setMaximum( 0x1000 / 16 ); editor->setScrollBars( hbar, vbar ); @@ -2175,11 +2175,18 @@ void QHexEdit::resizeEvent(QResizeEvent *event) if ( viewWidth >= pxLineWidth ) { pxLineXScroll = 0; + hbar->setMaximum(0); + hbar->hide(); } else { - pxLineXScroll = (int)(0.010f * (float)hbar->value() * (float)(pxLineWidth - viewWidth) ); + hbar->setPageStep(viewWidth); + hbar->setMaximum(pxLineWidth - viewWidth); + hbar->show(); + pxLineXScroll = hbar->value(); } + vbar->setMaximum( maxLineOffset ); + vbar->setPageStep( (3*viewLines)/4 ); } //---------------------------------------------------------------------------- @@ -3646,7 +3653,9 @@ void QHexEdit::memModeUpdate(void) } maxLineOffset = mb.numLines() - viewLines + 1; - vbar->setMaximum( memSize / 16 ); + //vbar->setMaximum( memSize / 16 ); + vbar->setMaximum( maxLineOffset ); + vbar->setPageStep( (3*viewLines)/4 ); } } //----------------------------------------------------------------------------