From 283f206c241ff5ede6ec908c412a4f65fe4bb954 Mon Sep 17 00:00:00 2001 From: Brian Potchik Date: Tue, 20 Apr 2021 10:50:06 -0400 Subject: Fix TypeView filter layout. --- ui/typeview.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/ui/typeview.h b/ui/typeview.h index db9b72da..b24e3df9 100644 --- a/ui/typeview.h +++ b/ui/typeview.h @@ -191,8 +191,6 @@ public: void lineNumberAreaPaintEvent(QPaintEvent *event); int lineNumberAreaWidth(); - int paddingCols() const { return m_paddingCols; } - virtual bool canCut() override { return false; } virtual bool canCopy() override; virtual bool canCopyWithTransform() override { return false; } @@ -279,7 +277,7 @@ class BINARYNINJAUIAPI TypeFilter: public QWidget QComboBox* m_showTypes; QLineEdit* m_textFilter; - bool MatchesAutoFilter(const BinaryNinja::QualifiedName& name); + bool MatchesAutoFilter(BinaryViewRef data, const BinaryNinja::QualifiedName& name); bool MatchesTextFilter(const std::vector& lines); Q_SIGNALS: @@ -288,7 +286,7 @@ Q_SIGNALS: public: TypeFilter(TypesContainer* container); - std::map> GetFilteredTypeLines(); + std::map> GetFilteredTypeLines(BinaryViewRef data, int padding); void showAndFocus(); }; @@ -297,18 +295,14 @@ class BINARYNINJAUIAPI TypesContainer: public QWidget, public ViewContainer { Q_OBJECT - BinaryViewRef m_data; - ViewFrame* m_view; TypeView* m_typeView; TypeFilter* m_typeFilter; UIActionHandler m_actionHandler; - public: TypesContainer(BinaryViewRef data, ViewFrame* view); virtual View* getView() override { return m_typeView; } - BinaryViewRef getData() { return m_data; } TypeView* getTypesView() { return m_typeView; } TypeFilter* getTypeFilter() { return m_typeFilter; } -- cgit v1.3.1