diff --git a/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp b/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp index a097d742b9..e664b2ef09 100644 --- a/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp @@ -392,13 +392,12 @@ RegistersView::_Init() AddChild(fRegisterTable->ToView()); // columns + const float padding = be_control_look->DefaultLabelSpacing() * 2; fRegisterTable->AddColumn(new StringTableColumn(0, "Register", - be_plain_font->StringWidth("Register") - + be_control_look->DefaultLabelSpacing() * 2 + 5, 40, 1000, + be_plain_font->StringWidth("Register") + padding, 40, 1000, B_TRUNCATE_END, B_ALIGN_LEFT)); fRegisterTable->AddColumn(new RegisterValueColumn(1, "Value", - be_plain_font->StringWidth("0x00000000") - + be_control_look->DefaultLabelSpacing() * 2 + 5, 40, 1000, + be_fixed_font->StringWidth("0xffffffff00000000") + padding, 40, 1000, B_TRUNCATE_END, B_ALIGN_RIGHT)); fRegisterTableModel = new RegisterTableModel(fArchitecture); @@ -437,5 +436,3 @@ RegistersView::_AddFormatItem(BMenu* menu, int32 format) return B_OK; } - - diff --git a/src/apps/debugger/user_interface/gui/team_window/StackTraceView.cpp b/src/apps/debugger/user_interface/gui/team_window/StackTraceView.cpp index 6e6a98b723..c097818bbd 100644 --- a/src/apps/debugger/user_interface/gui/team_window/StackTraceView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/StackTraceView.cpp @@ -235,8 +235,8 @@ StackTraceView::_Init() AddChild(fFramesTable->ToView()); fFramesTable->SetSortingEnabled(false); - float addressWidth = be_plain_font->StringWidth("0x00000000") - + be_control_look->DefaultLabelSpacing() * 2 + 5; + float addressWidth = be_fixed_font->StringWidth("0xffffffff00000000") + + be_control_look->DefaultLabelSpacing(); // columns fFramesTable->AddColumn(new TargetAddressTableColumn(0, "Frame", diff --git a/src/apps/debugger/user_interface/gui/team_window/ThreadListView.cpp b/src/apps/debugger/user_interface/gui/team_window/ThreadListView.cpp index 90b1f6b238..fda41907e0 100644 --- a/src/apps/debugger/user_interface/gui/team_window/ThreadListView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/ThreadListView.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -366,9 +367,12 @@ ThreadListView::_Init() AddChild(fThreadsTable->ToView()); // 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)); - 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)); fThreadsTable->AddColumn(new StringTableColumn(2, "Name", 200, 40, 1000, B_TRUNCATE_END, B_ALIGN_LEFT)); diff --git a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp index e9fdef3624..095d69333b 100644 --- a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -2559,11 +2560,15 @@ VariablesView::_Init(ValueNodeManager* manager) fVariableTable->SetSortingEnabled(false); // 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)); - 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)); - fVariableTable->AddColumn(new StringTableColumn(2, "Type", 80, 40, 1000, + fVariableTable->AddColumn(new StringTableColumn(2, "Type", + be_fixed_font->StringWidth("std::vector") + padding, 40, 1000, B_TRUNCATE_END, B_ALIGN_LEFT)); fVariableTableModel = new VariableTableModel(manager);