From 315cc2a4af094012353bba2ea200612919da6475 Mon Sep 17 00:00:00 2001 From: Mark Long Date: Sun, 30 Oct 2016 17:19:29 -0500 Subject: [PATCH] Preserve catalog widget size when DiskTools are hidden --- src/ui/diskexplorer/DiskExplorer.cpp | 11 +++++++++-- src/ui/diskexplorer/DiskExplorer.h | 3 +++ src/ui/viewers/disassemblerviewer.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/ui/diskexplorer/DiskExplorer.cpp b/src/ui/diskexplorer/DiskExplorer.cpp index 0853eff..186bb8f 100644 --- a/src/ui/diskexplorer/DiskExplorer.cpp +++ b/src/ui/diskexplorer/DiskExplorer.cpp @@ -17,6 +17,7 @@ DiskExplorer::DiskExplorer(QWidget *parent) : QMainWindow(parent) m_action_Unload_Disk_Image = 0; m_disk = 0; m_horizSizePref = -1; + m_toolsHidden = true; resize(300,800); initUi(); @@ -190,6 +191,7 @@ void DiskExplorer::handleDiskItemSelectedDefaultOpen(DiskFile *disk, FileDescrip void DiskExplorer::setDiskToolsVisible(bool visible) { + m_toolsHidden = !visible; if (visible) { m_gridLayout->setColumnStretch(0,4); @@ -233,7 +235,6 @@ void DiskExplorer::showEvent(QShowEvent *event) if (m_horizSizePref == -1) { m_horizSizePref = this->width(); - qDebug() << "New Horiz Size Pref = " << m_horizSizePref; } } @@ -248,5 +249,11 @@ void DiskExplorer::closeEvent(QCloseEvent *) } } - +void DiskExplorer::resizeEvent(QResizeEvent *) +{ + if (m_toolsHidden) + { + m_horizSizePref = this->width(); + } +} diff --git a/src/ui/diskexplorer/DiskExplorer.h b/src/ui/diskexplorer/DiskExplorer.h index 44b0b1b..833750f 100644 --- a/src/ui/diskexplorer/DiskExplorer.h +++ b/src/ui/diskexplorer/DiskExplorer.h @@ -46,6 +46,7 @@ protected: void showEvent(QShowEvent *event); void closeEvent(QCloseEvent *); + void resizeEvent(QResizeEvent *); protected slots: void doResize(); @@ -72,6 +73,8 @@ private: int m_horizSizePref; QList m_viewerList; + + bool m_toolsHidden; }; #endif // DISKEXPLORER_H diff --git a/src/ui/viewers/disassemblerviewer.h b/src/ui/viewers/disassemblerviewer.h index ffc3a8e..98fecf7 100644 --- a/src/ui/viewers/disassemblerviewer.h +++ b/src/ui/viewers/disassemblerviewer.h @@ -29,6 +29,7 @@ public: QString getPotentialLabel(quint16 address); virtual bool optionsMenuItems(QMenu *); + bool canPrint() const; bool canExport() const;