Hot-update the font size after changing the view font size. Fix Vecto…

…r35#29

ui/breakpointswidget.cpp

@@ -94,7 +94,7 @@ QVariant DebugBreakpointsListModel::data(const QModelIndex& index, int role) con
 	if (!item)
 		return QVariant();
 
-	if (role != Qt::DisplayRole)
+	if ((role != Qt::DisplayRole) && (role != Qt::SizeHintRole))
 		return QVariant();
 
 	switch (index.column())
@@ -118,11 +118,18 @@ QVariant DebugBreakpointsListModel::data(const QModelIndex& index, int role) con
 			auto fileName = fileInfo.fileName();
 			text = QString::fromStdString(fmt::format("{} + 0x{:x}", fileName.toStdString(), item->location().offset));
 		}
+
+		if (role == Qt::SizeHintRole)
+			return QVariant((qulonglong)text.size());
+
 		return QVariant(text);
 	}
 	case DebugBreakpointsListModel::AddressColumn:
 	{
 		QString text = QString::fromStdString(fmt::format("0x{:x}", item->address()));
+		if (role == Qt::SizeHintRole)
+			return QVariant((qulonglong)text.size());
+
 		return QVariant(text);
 	}
 	}
@@ -212,6 +219,13 @@ void DebugBreakpointsItemDelegate::updateFonts()
 }
 
 
+QSize DebugBreakpointsItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& idx) const
+{
+	auto totalWidth = (idx.data(Qt::SizeHintRole).toInt() + 2) * m_charWidth + 4;
+	return QSize(totalWidth, m_charHeight + 2);
+}
+
+
 DebugBreakpointsWidget::DebugBreakpointsWidget(ViewFrame* view, BinaryViewRef data, Menu* menu) : m_view(view)
 {
 	m_controller = DebuggerController::GetController(data);
@@ -283,10 +297,10 @@ void DebugBreakpointsWidget::onDoubleClicked()
 }
 
 
-//void DebugBreakpointsWidget::notifyFontChanged()
-//{
-//	m_delegate->updateFonts();
-//}
+void DebugBreakpointsWidget::updateFonts()
+{
+	m_delegate->updateFonts();
+}
 
 
 void DebugBreakpointsWidget::contextMenuEvent(QContextMenuEvent* event)
@@ -395,52 +409,3 @@ void DebugBreakpointsWidget::updateContent()
 
 	m_model->updateRows(bps);
 }
-
-
-BreakpointSideBarWidget::BreakpointSideBarWidget(const QString& name, ViewFrame* view, BinaryViewRef data) :
-	SidebarWidget(name), m_view(view)
-{
-	QVBoxLayout* layout = new QVBoxLayout(this);
-	layout->setContentsMargins(0, 0, 0, 0);
-	layout->setSpacing(0);
-	layout->setAlignment(Qt::AlignTop);
-
-	m_breakpointsWidget = new DebugBreakpointsWidget(m_view, data, m_menu);
-
-	layout->addWidget(m_breakpointsWidget);
-	setLayout(layout);
-
-	m_ui = DebuggerUI::GetForViewFrame(view);
-	connect(m_ui, &DebuggerUI::debuggerEvent, this, &BreakpointSideBarWidget::uiEventHandler);
-}
-
-
-BreakpointSideBarWidget::~BreakpointSideBarWidget() {}
-
-
-void BreakpointSideBarWidget::uiEventHandler(const DebuggerEvent& event)
-{
-	switch (event.type)
-	{
-	case TargetStoppedEventType:
-	case DetachedEventType:
-	case QuitDebuggingEventType:
-	case BackEndDisconnectedEventType:
-	case RelativeBreakpointAddedEvent:
-	case AbsoluteBreakpointAddedEvent:
-	case RelativeBreakpointRemovedEvent:
-	case AbsoluteBreakpointRemovedEvent:
-		updateContent();
-	default:
-		break;
-	}
-}
-
-
-void BreakpointSideBarWidget::updateContent()
-{
-	m_breakpointsWidget->updateContent();
-}
-
-
-void BreakpointSideBarWidget::notifyFontChanged() {}

ui/breakpointswidget.h

@@ -103,6 +103,7 @@ class DebugBreakpointsItemDelegate : public QStyledItemDelegate
 	DebugBreakpointsItemDelegate(QWidget* parent);
 	void updateFonts();
 	void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& idx) const;
+	QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& idx) const;
 };
 
 
@@ -139,6 +140,7 @@ class DebugBreakpointsWidget : public QWidget
 	~DebugBreakpointsWidget();
 
 	void uiEventHandler(const DebuggerEvent& event);
+	void updateFonts();
 
 private slots:
 	void jump();
@@ -152,36 +154,3 @@ public slots:
 
 
 class DebuggerUI;
-class BreakpointSideBarWidget : public SidebarWidget
-{
-	Q_OBJECT;
-
-	ViewFrame* m_view;
-
-	DebugBreakpointsWidget* m_breakpointsWidget;
-
-	DebuggerUI* m_ui;
-
-	virtual void notifyFontChanged() override;
-
-private slots:
-	void uiEventHandler(const DebuggerEvent& event);
-
-public:
-	BreakpointSideBarWidget(const QString& name, ViewFrame* view, BinaryViewRef data);
-	~BreakpointSideBarWidget();
-
-	void updateContent();
-};
-
-
-// class BreakpointWidgetType : public SidebarWidgetType {
-// public:
-//	BreakpointWidgetType(const QImage& icon, const QString& name) : SidebarWidgetType(icon, name) { }
-//
-//	bool isInReferenceArea() const override { return false; }
-//
-//	SidebarWidget* createWidget(ViewFrame* frame, BinaryViewRef data) override {
-//		return new BreakpointSideBarWidget("Breakpoint", frame, data);
-//	}
-// };

ui/debuggerwidget.cpp

@@ -65,7 +65,8 @@ DebuggerWidget::~DebuggerWidget() {}
 
 void DebuggerWidget::notifyFontChanged()
 {
-	LogWarn("font changed");
+	m_registersWidget->updateFonts();
+	m_breakpointsWidget->updateFonts();
 }
 
 

ui/moduleswidget.cpp

@@ -558,6 +558,12 @@ void DebugModulesWidget::setFilter(const string& filter)
 }
 
 
+void DebugModulesWidget::updateFonts()
+{
+	m_delegate->updateFonts();
+}
+
+
 void DebugModulesWidget::scrollToFirstItem() {}
 
 
@@ -597,6 +603,12 @@ DebugModulesWithFilter::DebugModulesWithFilter(ViewFrame* view, BinaryViewRef da
 }
 
 
+void DebugModulesWithFilter::updateFonts()
+{
+	m_modules->updateFonts();
+}
+
+
 GlobalDebugModulesContainer::GlobalDebugModulesContainer(const QString& title) :
 	GlobalAreaWidget(title), m_currentFrame(nullptr), m_consoleStack(new QStackedWidget)
 {
@@ -684,6 +696,16 @@ void GlobalDebugModulesContainer::notifyViewChanged(ViewFrame* frame)
 }
 
 
+void GlobalDebugModulesContainer::notifyFontChanged()
+{
+	for (auto it = m_widgetMap.begin(); it != m_widgetMap.end(); it++)
+	{
+		if (it.value())
+			it.value()->updateFonts();
+	}
+}
+
+
 DebugModulesFilterProxyModel::DebugModulesFilterProxyModel(QObject* parent) : QSortFilterProxyModel(parent)
 {
 	setFilterCaseSensitivity(Qt::CaseInsensitive);

ui/moduleswidget.h

@@ -167,6 +167,7 @@ class DebugModulesWidget : public QWidget, public FilterTarget
 
 	void updateColumnWidths();
 	void notifyModulesChanged(std::vector<DebugModule> modules);
+	void updateFonts();
 
 private slots:
 	void jumpToStart();
@@ -191,7 +192,7 @@ class DebugModulesWithFilter : public QWidget
 
 public:
 	DebugModulesWithFilter(ViewFrame* view, BinaryViewRef data);
-	void updateContent();
+	void updateFonts();
 };
 
 
@@ -213,4 +214,5 @@ class GlobalDebugModulesContainer : public GlobalAreaWidget
 	GlobalDebugModulesContainer(const QString& title);
 
 	void notifyViewChanged(ViewFrame*) override;
+	void notifyFontChanged() override;
 };

ui/registerswidget.cpp

@@ -523,6 +523,12 @@ void DebugRegistersWidget::updateContent()
 }
 
 
+void DebugRegistersWidget::updateFonts()
+{
+	m_delegate->updateFonts();
+}
+
+
 void DebugRegistersWidget::setToZero()
 {
 	QModelIndexList sel = m_table->selectionModel()->selectedIndexes();
@@ -725,6 +731,13 @@ void DebugRegistersContainer::updateContent()
 	m_register->updateContent();
 }
 
+
+void DebugRegistersContainer::updateFonts()
+{
+	m_register->updateFonts();
+}
+
+
 // TODO: Group this with other settings key constants if more pop up.
 constexpr auto HideUnusedRegistersKey = "ui/debugger/registers/hideUnused";
 

ui/registerswidget.h

@@ -185,6 +185,7 @@ class DebugRegistersWidget : public QWidget, public FilterTarget
 public:
 	DebugRegistersWidget(ViewFrame* view, BinaryViewRef data, Menu* menu);
 	void notifyRegistersChanged(std::vector<DebugRegister> regs);
+	void updateFonts();
 
 private slots:
 	void setToZero();
@@ -212,4 +213,5 @@ class DebugRegistersContainer : public QWidget
 public:
 	DebugRegistersContainer(ViewFrame* view, BinaryViewRef data, Menu* menu);
 	void updateContent();
+	void updateFonts();
 };

ui/threadframes.cpp

@@ -412,6 +412,11 @@ void ThreadFramesWidget::makeItSoloThread()
 		m_debugger->SetActiveThread(soloTid);
 }
 
+void ThreadFramesWidget::updateFonts()
+{
+	m_delegate->updateFonts();
+}
+
 void ThreadFramesWidget::resumeThread()
 {
 	QModelIndexList sel = m_threadFramesTree->selectionModel()->selectedIndexes();
@@ -834,3 +839,13 @@ void GlobalThreadFramesContainer::notifyViewChanged(ViewFrame* frame)
 
 	m_consoleStack->setCurrentWidget(currentConsole);
 }
+
+
+void GlobalThreadFramesContainer::notifyFontChanged()
+{
+	for (auto it = m_consoleMap.begin(); it != m_consoleMap.end(); it++)
+	{
+		if (it.value())
+			it.value()->updateFonts();
+	}
+}

ui/threadframes.h

@@ -175,7 +175,7 @@ public slots:
 	ThreadFramesWidget(QWidget* parent, ViewFrame* view, BinaryViewRef debugger);
 	~ThreadFramesWidget();
 
-	void notifyFontChanged();
+	void updateFonts();
 
 private slots:
 	void onDoubleClicked();
@@ -207,4 +207,5 @@ class GlobalThreadFramesContainer : public GlobalAreaWidget
 	void sendText(const QString& msg) const;
 
 	void notifyViewChanged(ViewFrame*) override;
+	void notifyFontChanged() override;
 };