fix triage entropy graph navigation for mapped files

4 files changed, 8 insertions, 8 deletions

diff --git a/examples/triage/entropy.cpp b/examples/triage/entropy.cpp
index 229c7079..3e3b0963 100644
--- a/examples/triage/entropy.cpp
+++ b/examples/triage/entropy.cpp
@@ -74,6 +74,7 @@ EntropyWidget::EntropyWidget(QWidget* parent, TriageView* view, BinaryViewRef da
 	timer->setSingleShot(false);
 	timer->start();
 
+	setCursor(Qt::PointingHandCursor);
 	setMinimumHeight(UIContext::getScaledWindowSize(32, 32).height());
 }
 
diff --git a/examples/triage/view.cpp b/examples/triage/view.cpp
index e2524aac..c845a4fa 100644
--- a/examples/triage/view.cpp
+++ b/examples/triage/view.cpp
@@ -229,15 +229,11 @@ void TriageView::navigateToFileOffset(uint64_t offset)
 			return;
 		if (!hasAddr)
 			frame->navigate("Hex:Raw", offset);
-		else if (BinaryNinja::Settings::Instance()->Get<bool>("ui.view.graph.preferred") &&
-			frame->getCurrentBinaryView() &&
-			frame->getCurrentBinaryView()->GetAnalysisFunctionsForAddress(offset).size() > 0)
-		{
-			frame->navigate("Graph:" + frame->getCurrentDataType(), offset);
-		}
 		else
 		{
-			frame->navigate("Linear:" + frame->getCurrentDataType(), offset);
+			QString viewType = BinaryNinja::Settings::Instance()->Get<bool>("ui.view.graph.preferred") ? "Graph" : "Linear";
+			QString dataType = QString::fromStdString(m_data->GetTypeName());
+			frame->navigate(viewType + ":" + dataType, addr);
 		}
 	}
 	else
diff --git a/python/examples/triage/entropy.py b/python/examples/triage/entropy.py
index bcd2affb..53868cc9 100644
--- a/python/examples/triage/entropy.py
+++ b/python/examples/triage/entropy.py
@@ -53,6 +53,7 @@ class EntropyWidget(QWidget):
 		self.timer.setSingleShot(False)
 		self.timer.start()
 
+		self.setCursor(Qt.PointingHandCursor)
 		self.setMinimumHeight(UIContext.getScaledWindowSize(32, 32).height())
 
 	def paintEvent(self, event):
diff --git a/python/examples/triage/view.py b/python/examples/triage/view.py
index d7a29bb6..5a39197f 100644
--- a/python/examples/triage/view.py
+++ b/python/examples/triage/view.py
@@ -151,7 +151,9 @@ class TriageView(QScrollArea, View):
 			if addr is None:
 				view_frame.navigate("Hex:Raw", offset)
 			else:
-				view_frame.navigate("Linear:" + view_frame.getCurrentDataType(), addr)
+				view_type = "Graph" if Settings().get_bool("ui.view.graph.preferred") else "Linear"
+				data_type = self.data.view_type
+				view_frame.navigate(f"{view_type}:{data_type}", addr)
 		else:
 			if self.data == self.data.file.raw:
 				addr = offset