AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Account for indentation in wxDataViewCtrl::GetBestColumnWidth().

Browse Source 
Generic control only accounted for actual content, but didn't consider
indentation level when calculating width of the expander column.

Fixes #13629.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2011-11-25 18:11:16 +00:00
parent 65c01ad0d4
commit 0fdeaabe4d
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/generic/datavgen.cpp
View File

@ -662,11 +662,16 @@ public:
int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode int GetLineAt( unsigned int y ) const; // y / m_lineHeight in fixed mode
void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; } void SetRowHeight( int lineHeight ) { m_lineHeight = lineHeight; }
int GetRowHeight() const { return m_lineHeight; }
// Some useful functions for row and item mapping // Some useful functions for row and item mapping
wxDataViewItem GetItemByRow( unsigned int row ) const; wxDataViewItem GetItemByRow( unsigned int row ) const;
int GetRowByItem( const wxDataViewItem & item ) const; int GetRowByItem( const wxDataViewItem & item ) const;
wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
// We did not need this temporarily
// wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
// Methods for building the mapping tree // Methods for building the mapping tree
void BuildTree( wxDataViewModel * model ); void BuildTree( wxDataViewModel * model );
void DestroyTree(); void DestroyTree();
@ -692,10 +697,6 @@ public:
void OnColumnsCountChanged(); void OnColumnsCountChanged();
private: private:
wxDataViewTreeNode * GetTreeNodeByRow( unsigned int row ) const;
// We did not need this temporarily
// wxDataViewTreeNode * GetTreeNodeByItem( const wxDataViewItem & item );
int RecalculateCount(); int RecalculateCount();
// Return false only if the event was vetoed by its handler. // Return false only if the event was vetoed by its handler.
@ -4481,16 +4482,25 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
class MaxWidthCalculator class MaxWidthCalculator
{ {
public: public:
MaxWidthCalculator(wxDataViewMainWindow *clientArea, MaxWidthCalculator(const wxDataViewCtrl *dvc,
wxDataViewMainWindow *clientArea,
wxDataViewRenderer *renderer, wxDataViewRenderer *renderer,
const wxDataViewModel *model, const wxDataViewModel *model,
unsigned column) unsigned column,
int expanderSize)
: m_width(0), : m_width(0),
m_dvc(dvc),
m_clientArea(clientArea), m_clientArea(clientArea),
m_renderer(renderer), m_renderer(renderer),
m_model(model), m_model(model),
m_column(column) m_column(column),
m_expanderSize(expanderSize)
{ {
m_isExpanderCol =
!clientArea->IsList() &&
(column == 0 ||
GetExpanderColumnOrFirstOne(const_cast<wxDataViewCtrl*>(dvc)) == dvc->GetColumnAt(column));
} }
void UpdateWithWidth(int width) void UpdateWithWidth(int width)
@ -4500,23 +4510,40 @@ unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
void UpdateWithRow(int row) void UpdateWithRow(int row)
{ {
wxDataViewItem item = m_clientArea->GetItemByRow(row); int indent = 0;
wxDataViewItem item;
if ( m_isExpanderCol )
{
wxDataViewTreeNode *node = m_clientArea->GetTreeNodeByRow(row);
item = node->GetItem();
indent = m_dvc->GetIndent() * node->GetIndentLevel() + m_expanderSize;
}
else
{
item = m_clientArea->GetItemByRow(row);
}
m_renderer->PrepareForItem(m_model, item, m_column); m_renderer->PrepareForItem(m_model, item, m_column);
m_width = wxMax(m_width, m_renderer->GetSize().x); m_width = wxMax(m_width, m_renderer->GetSize().x + indent);
} }
int GetMaxWidth() const { return m_width; } int GetMaxWidth() const { return m_width; }
private: private:
int m_width; int m_width;
const wxDataViewCtrl *m_dvc;
wxDataViewMainWindow *m_clientArea; wxDataViewMainWindow *m_clientArea;
wxDataViewRenderer *m_renderer; wxDataViewRenderer *m_renderer;
const wxDataViewModel *m_model; const wxDataViewModel *m_model;
unsigned m_column; unsigned m_column;
bool m_isExpanderCol;
int m_expanderSize;
}; };
MaxWidthCalculator calculator(m_clientArea, renderer, MaxWidthCalculator calculator(this, m_clientArea, renderer,
GetModel(), column->GetModelColumn()); GetModel(), column->GetModelColumn(),
m_clientArea->GetRowHeight());
if ( m_headerArea ) if ( m_headerArea )
{ {