Use new sidebar API instead of global area widgets

1ikeadragon · Feb 2, 2024 · 799f77c · 799f77c
1 parent 318e612
commit 799f77c
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 25 deletions.
diff --git a/ui/moduleswidget.cpp b/ui/moduleswidget.cpp
@@ -603,7 +603,7 @@ void DebugModulesWithFilter::updateFonts()
 
 
 GlobalDebugModulesContainer::GlobalDebugModulesContainer(const QString& title) :
-	GlobalAreaWidget(title), m_currentFrame(nullptr), m_consoleStack(new QStackedWidget)
+	SidebarWidget(title), m_currentFrame(nullptr), m_consoleStack(new QStackedWidget)
 {
 	auto* layout = new QVBoxLayout(this);
 	layout->setContentsMargins(0, 0, 0, 0);
@@ -720,3 +720,8 @@ bool DebugModulesFilterProxyModel::filterAcceptsRow(int sourceRow, const QModelI
 	}
 	return false;
 }
+
+
+DebugModulesSidebarWidgetType::DebugModulesSidebarWidgetType() :
+	SidebarWidgetType(QImage(":/letters/images/letter-icons/letter-M.png"), "Debugger Modules")
+{}
diff --git a/ui/moduleswidget.h b/ui/moduleswidget.h
@@ -195,7 +195,7 @@ class DebugModulesWithFilter : public QWidget
 };
 
 
-class GlobalDebugModulesContainer : public GlobalAreaWidget
+class GlobalDebugModulesContainer : public SidebarWidget
 {
 	ViewFrame* m_currentFrame;
 	QHash<ViewFrame*, DebugModulesWithFilter*> m_widgetMap;
@@ -215,3 +215,13 @@ class GlobalDebugModulesContainer : public GlobalAreaWidget
 	void notifyViewChanged(ViewFrame*) override;
 	void notifyFontChanged() override;
 };
+
+
+class DebugModulesSidebarWidgetType : public SidebarWidgetType
+{
+public:
+	DebugModulesSidebarWidgetType();
+	SidebarWidgetLocation defaultLocation() const override { return SidebarWidgetLocation::RightBottom; }
+	SidebarContextSensitivity contextSensitivity() const override { return SelfManagedSidebarContext; }
+	bool hideIfNoContent() const override { return true; }
+};
diff --git a/ui/threadframes.cpp b/ui/threadframes.cpp
@@ -746,7 +746,7 @@ void ThreadFramesWidget::onDoubleClicked()
 
 
 GlobalThreadFramesContainer::GlobalThreadFramesContainer(const QString& title) :
-	GlobalAreaWidget(title), m_currentFrame(nullptr), m_consoleStack(new QStackedWidget)
+	SidebarWidget(title), m_currentFrame(nullptr), m_consoleStack(new QStackedWidget)
 {
 	auto* layout = new QVBoxLayout(this);
 	layout->setContentsMargins(0, 0, 0, 0);
@@ -840,3 +840,8 @@ void GlobalThreadFramesContainer::notifyFontChanged()
 			it.value()->updateFonts();
 	}
 }
+
+
+ThreadFramesSidebarWidgetType::ThreadFramesSidebarWidgetType() :
+	SidebarWidgetType(QImage(":/letters/images/letter-icons/letter-T.png"), "Stack Trace")
+{}
diff --git a/ui/threadframes.h b/ui/threadframes.h
@@ -184,7 +184,7 @@ private slots:
 	void copy();
 };
 
-class GlobalThreadFramesContainer : public GlobalAreaWidget
+class GlobalThreadFramesContainer : public SidebarWidget
 {
 	ViewFrame* m_currentFrame;
 	QHash<ViewFrame*, ThreadFramesWidget*> m_consoleMap;
@@ -208,3 +208,13 @@ class GlobalThreadFramesContainer : public GlobalAreaWidget
 	void notifyViewChanged(ViewFrame*) override;
 	void notifyFontChanged() override;
 };
+
+
+class ThreadFramesSidebarWidgetType : public SidebarWidgetType
+{
+public:
+	ThreadFramesSidebarWidgetType();
+	SidebarWidgetLocation defaultLocation() const override { return SidebarWidgetLocation::RightBottom; }
+	SidebarContextSensitivity contextSensitivity() const override { return SelfManagedSidebarContext; }
+	bool hideIfNoContent() const override { return true; }
+};
diff --git a/ui/ui.cpp b/ui/ui.cpp
@@ -692,7 +692,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
 	//	}));
 	//	debuggerMenu->addAction("Activate Debug Adapter", "Launch");
 
-	QString showAreaWidgets = "Show Debugger Global Area Widgets";
+	QString showAreaWidgets = "Show Debugger Sidebar Widgets";
 	UIAction::registerAction(showAreaWidgets);
 
 	context->globalActions()->bindAction(showAreaWidgets, UIAction([](const UIActionContext& ctxt) {
@@ -882,8 +882,8 @@ void GlobalDebuggerUI::SetDisplayingGlobalAreaWidgets(bool display)
 
 void GlobalDebuggerUI::CreateGlobalAreaWidgets(UIContext* context)
 {
-	auto globalArea = context->globalArea();
-	if (!globalArea)
+	auto sidebar = context->sidebar();
+	if (!sidebar)
 		return;
 
 	// Hacky way to create the Debugger Console. Note, since MainWindow internally keeps a list of scripting consoles,
@@ -893,52 +893,50 @@ void GlobalDebuggerUI::CreateGlobalAreaWidgets(UIContext* context)
 	// emulate what happens when the user clicks the "Create Debugger Console" item.
 	if (context->contentActionHandler())
 	{
-		auto widget = globalArea->widget("Debugger Console");
-		if (!widget)
+		if (!sidebar->hasWidgetWithTitle("Console", "Debugger"))
 			context->contentActionHandler()->executeAction("Create Debugger Console");
 
-		widget = globalArea->widget("Target Console");
-		if (!widget)
+		if (!sidebar->hasWidgetWithTitle("Console", "Target"))
 			context->contentActionHandler()->executeAction("Create Target Console");
 	}
 
-	auto widget = globalArea->widget("Stack Trace");
+	auto widget = sidebar->widget("Stack Trace");
 	if (!widget)
 	{
 		auto* globalThreadFramesContainer = new GlobalThreadFramesContainer("Stack Trace");
-		globalArea->addWidget(globalThreadFramesContainer);
+		sidebar->addWidget("Stack Trace", globalThreadFramesContainer);
 	}
 
-	widget = globalArea->widget("Debugger Modules");
+	widget = sidebar->widget("Debugger Modules");
 	if (!widget)
 	{
 		auto* globalDebugModulesContainer = new GlobalDebugModulesContainer("Debugger Modules");
-		globalArea->addWidget(globalDebugModulesContainer);
+		sidebar->addWidget("Debugger Modules", globalDebugModulesContainer);
 	}
 }
 
 
 void GlobalDebuggerUI::CloseGlobalAreaWidgets(UIContext* context)
 {
-	auto globalArea = context->globalArea();
-	if (!globalArea)
+	auto sidebar = context->sidebar();
+	if (!sidebar)
 		return;
 
-	auto widget = globalArea->widget("Stack Trace");
+	auto widget = sidebar->widget("Stack Trace");
 	if (widget)
-		globalArea->closeTab(widget);
+		sidebar->removeWidget("Stack Trace", widget);
 
-	widget = globalArea->widget("Debugger Modules");
+	widget = sidebar->widget("Debugger Modules");
 	if (widget)
-		globalArea->closeTab(widget);
+		sidebar->removeWidget("Debugger Modules", widget);
 
-	widget = globalArea->widget("Debugger Console");
+	widget = sidebar->widgetWithTitle("Console", "Debugger");
 	if (widget)
-		globalArea->closeTab(widget);
+		sidebar->removeWidget("Console", widget);
 
-	widget = globalArea->widget("Target Console");
+	widget = sidebar->widgetWithTitle("Console", "Target");
 	if (widget)
-		globalArea->closeTab(widget);
+		sidebar->removeWidget("Console", widget);
 }
 
 
@@ -1451,6 +1449,8 @@ static bool ConnectedAndRunning(BinaryView* view, uint64_t addr)
 void GlobalDebuggerUI::InitializeUI()
 {
 	Sidebar::addSidebarWidgetType(new DebuggerWidgetType(QImage(":/debugger_icons/icons/debugger.svg"), "Debugger"));
+	Sidebar::addSidebarWidgetType(new DebugModulesSidebarWidgetType());
+	Sidebar::addSidebarWidgetType(new ThreadFramesSidebarWidgetType());
 
 	// We must use the sequence of these four calls to do the job, otherwise the keybinding does not work.
 	// Though it really should be the case where I can specify the keybinding in the first registerAction() call.