diff options
| author | Glenn Smith <glenn@vector35.com> | 2019-11-16 21:10:51 -0500 |
|---|---|---|
| committer | Glenn Smith <glenn@vector35.com> | 2020-01-16 01:06:45 -0500 |
| commit | e4b45718df111abcc79eb353c4ab106e130e4ef1 (patch) | |
| tree | c8e82b26de292485d1f5b26aaf69bd7eaa372b10 | |
| parent | 185a77b28a90335a201e27c9cb949ce2d45a183e (diff) | |
Factor gutter width/tag token width into a setting
| -rw-r--r-- | basicblock.cpp | 12 | ||||
| -rw-r--r-- | binaryninjaapi.h | 2 | ||||
| -rw-r--r-- | binaryninjacore.h | 4 | ||||
| -rw-r--r-- | ui/linearview.h | 1 | ||||
| -rw-r--r-- | ui/tokenizedtextview.h | 1 |
5 files changed, 17 insertions, 3 deletions
diff --git a/basicblock.cpp b/basicblock.cpp index 0f4546ef..b9936896 100644 --- a/basicblock.cpp +++ b/basicblock.cpp @@ -72,6 +72,18 @@ void DisassemblySettings::SetMaximumSymbolWidth(size_t width) } +size_t DisassemblySettings::GetGutterWidth() const +{ + return BNGetDisassemblyGutterWidth(m_object); +} + + +void DisassemblySettings::SetGutterWidth(size_t width) +{ + BNSetDisassemblyGutterWidth(m_object, width); +} + + DisassemblyTextLine::DisassemblyTextLine() { addr = 0; diff --git a/binaryninjaapi.h b/binaryninjaapi.h index e231bad6..b409a0e6 100644 --- a/binaryninjaapi.h +++ b/binaryninjaapi.h @@ -2797,6 +2797,8 @@ __attribute__ ((format (printf, 1, 2))) void SetWidth(size_t width); size_t GetMaximumSymbolWidth() const; void SetMaximumSymbolWidth(size_t width); + size_t GetGutterWidth() const; + void SetGutterWidth(size_t width); }; class Function; diff --git a/binaryninjacore.h b/binaryninjacore.h index c4c4492c..81ecc8af 100644 --- a/binaryninjacore.h +++ b/binaryninjacore.h @@ -72,8 +72,6 @@ #define BN_MAX_STRING_LENGTH 128 -#define BN_TAG_TOKEN_WIDTH 5 - #define LLVM_SVCS_CB_NOTE 0 #define LLVM_SVCS_CB_WARNING 1 #define LLVM_SVCS_CB_ERROR 2 @@ -3077,6 +3075,8 @@ __attribute__ ((format (printf, 1, 2))) BINARYNINJACOREAPI void BNSetDisassemblyWidth(BNDisassemblySettings* settings, size_t width); BINARYNINJACOREAPI size_t BNGetDisassemblyMaximumSymbolWidth(BNDisassemblySettings* settings); BINARYNINJACOREAPI void BNSetDisassemblyMaximumSymbolWidth(BNDisassemblySettings* settings, size_t width); + BINARYNINJACOREAPI size_t BNGetDisassemblyGutterWidth(BNDisassemblySettings* settings); + BINARYNINJACOREAPI void BNSetDisassemblyGutterWidth(BNDisassemblySettings* settings, size_t width); // Flow graphs BINARYNINJACOREAPI BNFlowGraph* BNCreateFlowGraph(); diff --git a/ui/linearview.h b/ui/linearview.h index 1081d744..62bb3dad 100644 --- a/ui/linearview.h +++ b/ui/linearview.h @@ -12,7 +12,6 @@ #define LINEAR_VIEW_UPDATE_CHECK_INTERVAL 200 #define MAX_STRING_TYPE_LENGTH 1048576 -#define EDGE_GUTTER_WIDTH 5 struct BINARYNINJAUIAPI LinearViewCursorPosition: public BinaryNinja::LinearDisassemblyPosition { diff --git a/ui/tokenizedtextview.h b/ui/tokenizedtextview.h index 7ef15ae9..118f7e9b 100644 --- a/ui/tokenizedtextview.h +++ b/ui/tokenizedtextview.h @@ -44,6 +44,7 @@ class BINARYNINJAUIAPI TokenizedTextView: public QAbstractScrollArea, public Vie bool m_navByRef = false; std::vector<BinaryNinja::LinearDisassemblyLine> m_lines; + DisassemblySettingsRef m_settings; QTimer* m_updateTimer; |