Factor gutter width/tag token width into a setting

Author: CouleeApps

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;

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;

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();

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
 {

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;