From b7521c12b31aa938e497bb25f893131405170cc6 Mon Sep 17 00:00:00 2001 From: Brian Potchik Date: Sun, 7 Aug 2022 23:43:00 -0400 Subject: Fix navigation with respect to preserving graph and IL view preferences. --- ui/featuremap.h | 1 - ui/viewframe.h | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/featuremap.h b/ui/featuremap.h index 93107eff..f4b82c03 100644 --- a/ui/featuremap.h +++ b/ui/featuremap.h @@ -78,7 +78,6 @@ class BINARYNINJAUIAPI FeatureMap : public QWidget, public BinaryNinja::BinaryDa FeatureMap(SplitPaneWidget* owner, BinaryViewRef data, bool vertical = true); virtual ~FeatureMap(); - View* getBinaryDataNavigableView(bool preferGraphView = false); void backgroundRefresh(); std::pair getLinearOffsetForAddress(uint64_t addr); diff --git a/ui/viewframe.h b/ui/viewframe.h index b8707d8b..21cbc6f1 100644 --- a/ui/viewframe.h +++ b/ui/viewframe.h @@ -359,7 +359,7 @@ class BINARYNINJAUIAPI ViewFrame : public QWidget std::map m_viewCache; std::list> m_back, m_forward; bool m_graphViewPreferred = false; - std::vector m_viewTypePriority; + QStringList m_viewTypePriority; int m_preferredSyncGroup = 1; InitialNavigation* m_initialNavigation = nullptr; @@ -406,9 +406,9 @@ class BINARYNINJAUIAPI ViewFrame : public QWidget View* getCurrentViewInterface() const { return View::getViewFromWidget(m_view); } QWidget* getCurrentWidget() const { return m_view; } - bool setViewType(const QString& type); - bool isGraphViewPreferred() { return m_graphViewPreferred; } - void setGraphViewPreferred(bool graphViewPreferred) { m_graphViewPreferred = graphViewPreferred; } + bool isGraphViewPreferred(); + void setPriorityView(const QString& viewType); + bool setViewType(const QString& viewType); void focus(); QWidget* getExtendedView(const QString& name, bool create = false); -- cgit v1.3.1