i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debugger: Use StringWidth()+DefaultLabelSpacing() to determine column widths.

Browse Source 
Much less cut off text in the default layout.
This commit is contained in:
Augustin Cavalier
2022-09-28 17:13:07 -04:00
parent 2bfacb1a20
commit 00c4575238
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp
+3 -6
View File
@@ -392,13 +392,12 @@ RegistersView::_Init()
AddChild(fRegisterTable->ToView()); AddChild(fRegisterTable->ToView());
// columns // columns
const float padding = be_control_look->DefaultLabelSpacing() * 2;
fRegisterTable->AddColumn(new StringTableColumn(0, "Register", fRegisterTable->AddColumn(new StringTableColumn(0, "Register",
be_plain_font->StringWidth("Register") be_plain_font->StringWidth("Register") + padding, 40, 1000,
+ be_control_look->DefaultLabelSpacing() * 2 + 5, 40, 1000,
B_TRUNCATE_END, B_ALIGN_LEFT)); B_TRUNCATE_END, B_ALIGN_LEFT));
fRegisterTable->AddColumn(new RegisterValueColumn(1, "Value", fRegisterTable->AddColumn(new RegisterValueColumn(1, "Value",
be_plain_font->StringWidth("0x00000000") be_fixed_font->StringWidth("0xffffffff00000000") + padding, 40, 1000,
+ be_control_look->DefaultLabelSpacing() * 2 + 5, 40, 1000,
B_TRUNCATE_END, B_ALIGN_RIGHT)); B_TRUNCATE_END, B_ALIGN_RIGHT));
fRegisterTableModel = new RegisterTableModel(fArchitecture); fRegisterTableModel = new RegisterTableModel(fArchitecture);
@@ -437,5 +436,3 @@ RegistersView::_AddFormatItem(BMenu* menu, int32 format)
return B_OK; return B_OK;
} }
src/apps/debugger/user_interface/gui/team_window/StackTraceView.cpp
+2 -2
View File
@@ -235,8 +235,8 @@ StackTraceView::_Init()
AddChild(fFramesTable->ToView()); AddChild(fFramesTable->ToView());
fFramesTable->SetSortingEnabled(false); fFramesTable->SetSortingEnabled(false);
float addressWidth = be_plain_font->StringWidth("0x00000000") float addressWidth = be_fixed_font->StringWidth("0xffffffff00000000")
+ be_control_look->DefaultLabelSpacing() * 2 + 5; + be_control_look->DefaultLabelSpacing();
// columns // columns
fFramesTable->AddColumn(new TargetAddressTableColumn(0, "Frame", fFramesTable->AddColumn(new TargetAddressTableColumn(0, "Frame",
src/apps/debugger/user_interface/gui/team_window/ThreadListView.cpp
+6 -2
View File
@@ -13,6 +13,7 @@
#include <Message.h> #include <Message.h>
#include <AutoLocker.h> #include <AutoLocker.h>
#include <ControlLook.h>
#include <ObjectList.h> #include <ObjectList.h>
#include <ToolTip.h> #include <ToolTip.h>
@@ -366,9 +367,12 @@ ThreadListView::_Init()
AddChild(fThreadsTable->ToView()); AddChild(fThreadsTable->ToView());
// columns // columns
fThreadsTable->AddColumn(new Int32TableColumn(0, "ID", 60, 20, 1000, const float padding = be_control_look->DefaultLabelSpacing() * 2;
fThreadsTable->AddColumn(new Int32TableColumn(0, "ID",
be_plain_font->StringWidth("12345") + padding, 20, 1000,
B_TRUNCATE_MIDDLE, B_ALIGN_RIGHT)); B_TRUNCATE_MIDDLE, B_ALIGN_RIGHT));
fThreadsTable->AddColumn(new StringTableColumn(1, "State", 80, 40, 1000, fThreadsTable->AddColumn(new StringTableColumn(1, "State",
be_plain_font->StringWidth("Debugged") + padding, 40, 1000,
B_TRUNCATE_END, B_ALIGN_LEFT)); B_TRUNCATE_END, B_ALIGN_LEFT));
fThreadsTable->AddColumn(new StringTableColumn(2, "Name", 200, 40, 1000, fThreadsTable->AddColumn(new StringTableColumn(2, "Name", 200, 40, 1000,
B_TRUNCATE_END, B_ALIGN_LEFT)); B_TRUNCATE_END, B_ALIGN_LEFT));
src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp
+8 -3
View File
@@ -13,6 +13,7 @@
#include <Alert.h> #include <Alert.h>
#include <Clipboard.h> #include <Clipboard.h>
#include <ControlLook.h>
#include <Looper.h> #include <Looper.h>
#include <PopUpMenu.h> #include <PopUpMenu.h>
#include <ToolTip.h> #include <ToolTip.h>
@@ -2559,11 +2560,15 @@ VariablesView::_Init(ValueNodeManager* manager)
fVariableTable->SetSortingEnabled(false); fVariableTable->SetSortingEnabled(false);
// columns // columns
fVariableTable->AddColumn(new StringTableColumn(0, "Variable", 80, 40, 1000, const float padding = be_control_look->DefaultLabelSpacing();
fVariableTable->AddColumn(new StringTableColumn(0, "Variable",
be_fixed_font->StringWidth("VariableName") + padding, 40, 1000,
B_TRUNCATE_END, B_ALIGN_LEFT)); B_TRUNCATE_END, B_ALIGN_LEFT));
fVariableTable->AddColumn(new VariableValueColumn(1, "Value", 80, 40, 1000, fVariableTable->AddColumn(new VariableValueColumn(1, "Value",
be_fixed_font->StringWidth("0xffffffff00000000") + padding, 40, 1000,
B_TRUNCATE_END, B_ALIGN_RIGHT)); B_TRUNCATE_END, B_ALIGN_RIGHT));
fVariableTable->AddColumn(new StringTableColumn(2, "Type", 80, 40, 1000, fVariableTable->AddColumn(new StringTableColumn(2, "Type",
be_fixed_font->StringWidth("std::vector<int32_t>") + padding, 40, 1000,
B_TRUNCATE_END, B_ALIGN_LEFT)); B_TRUNCATE_END, B_ALIGN_LEFT));
fVariableTableModel = new VariableTableModel(manager); fVariableTableModel = new VariableTableModel(manager);