Skip to content

Commit

Permalink
#5567: Show transform table headers
Browse files Browse the repository at this point in the history
  • Loading branch information
@codereader
codereader committed Apr 2, 2021
1 parent 9f781fb commit 35960fc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions install/ui/materialeditor.fbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2989,7 +2989,7 @@
<property name="border">0</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer82</property>
<property name="orient">wxHORIZONTAL</property>
Expand Down Expand Up @@ -3642,20 +3642,20 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">6</property>
<property name="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer77</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">1</property>
<object class="wxPanel" expanded="0">
<object class="wxPanel" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand Down Expand Up @@ -3706,7 +3706,7 @@
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="0">
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer62</property>
<property name="orient">wxVERTICAL</property>
Expand Down Expand Up @@ -3772,11 +3772,11 @@
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">6</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer8</property>
<property name="orient">wxVERTICAL</property>
Expand Down Expand Up @@ -3969,11 +3969,11 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="0">
<object class="sizeritem" expanded="1">
<property name="border">0</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxNotebook" expanded="0">
<object class="wxNotebook" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
Expand Down
10 changes: 5 additions & 5 deletions radiant/ui/materials/editor/MaterialEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1111,14 +1111,14 @@ void MaterialEditor::setupMaterialStageProperties()
auto transformationPanel = getControl<wxPanel>("MaterialStageTransformations");
_stageTransformations = wxutil::TreeModel::Ptr(new wxutil::TreeModel(_stageTransformationColumns, true));

_stageTransformView = wxutil::TreeView::CreateWithModel(transformationPanel, _stageTransformations.get(), wxDV_NO_HEADER);
_stageTransformView->AppendTextColumn("Type", _stageTransformationColumns.type.getColumnIndex(),
_stageTransformView = wxutil::TreeView::CreateWithModel(transformationPanel, _stageTransformations.get());
_stageTransformView->AppendTextColumn(_("#"), _stageTransformationColumns.index.getColumnIndex(),
wxDATAVIEW_CELL_INERT, wxCOL_WIDTH_AUTOSIZE, wxALIGN_NOT, wxDATAVIEW_COL_SORTABLE);
_stageTransformView->AppendTextColumn("Index", _stageTransformationColumns.index.getColumnIndex(),
_stageTransformView->AppendTextColumn(_("Type"), _stageTransformationColumns.type.getColumnIndex(),
wxDATAVIEW_CELL_INERT, wxCOL_WIDTH_AUTOSIZE, wxALIGN_NOT, wxDATAVIEW_COL_SORTABLE);
_stageTransformView->AppendTextColumn("Expr1", _stageTransformationColumns.expression1.getColumnIndex(),
_stageTransformView->AppendTextColumn(_("Expression 1"), _stageTransformationColumns.expression1.getColumnIndex(),
wxDATAVIEW_CELL_EDITABLE, wxCOL_WIDTH_AUTOSIZE, wxALIGN_NOT, wxDATAVIEW_COL_SORTABLE);
_stageTransformView->AppendTextColumn("Expr2", _stageTransformationColumns.expression2.getColumnIndex(),
_stageTransformView->AppendTextColumn(_("Expression 2"), _stageTransformationColumns.expression2.getColumnIndex(),
wxDATAVIEW_CELL_EDITABLE, wxCOL_WIDTH_AUTOSIZE, wxALIGN_NOT, wxDATAVIEW_COL_SORTABLE);

_stageTransformView->Bind(wxEVT_DATAVIEW_ITEM_EDITING_DONE, &MaterialEditor::_onStageTransformEdited, this);
Expand Down

0 comments on commit 35960fc

Please sign in to comment.