Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

By default, align renderers as column header under GTK+, too.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-04-08 10:39:57 +00:00
parent d18d9f6047
commit f2b7492a88
6 changed files with 95 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/gtk/dataview.cpp
View File

@@ -1468,8 +1468,21 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
return ret;
}
void wxDataViewRenderer::SetAlignment( int align )
void wxDataViewRenderer::GtkUpdateAlignment()
{
int align = m_alignment;
// query alignment from column ?
if (align == -1)
{
// None there yet
if (GetOwner() == NULL)
return;
align = GetOwner()->GetAlignment();
align |= wxALIGN_CENTRE_VERTICAL;
}
// horizontal alignment:
gfloat xalign = 0.0;
@@ -1499,40 +1512,16 @@ void wxDataViewRenderer::SetAlignment( int align )
g_value_unset( &gvalue2 );
}
int wxDataViewRenderer::GetAlignment() const
void wxDataViewRenderer::SetAlignment( int align )
{
int ret = 0;
GValue gvalue;
// horizontal alignment:
g_object_get( G_OBJECT(m_renderer), "xalign", &gvalue, NULL );
float xalign = g_value_get_float( &gvalue );
if (xalign < 0.5)
ret |= wxALIGN_LEFT;
else if (xalign == 0.5)
ret |= wxALIGN_CENTER_HORIZONTAL;
else
ret |= wxALIGN_RIGHT;
g_value_unset( &gvalue );
// vertical alignment:
g_object_get( G_OBJECT(m_renderer), "yalign", &gvalue, NULL );
float yalign = g_value_get_float( &gvalue );
if (yalign < 0.5)
ret |= wxALIGN_TOP;
else if (yalign == 0.5)
ret |= wxALIGN_CENTER_VERTICAL;
else
ret |= wxALIGN_BOTTOM;
g_value_unset( &gvalue );
return ret;
m_alignment = align;
GtkUpdateAlignment();
}
int wxDataViewRenderer::GetAlignment() const
{
return m_alignment;
}
// ---------------------------------------------------------
// wxDataViewTextRenderer
@@ -2564,6 +2553,9 @@ void wxDataViewColumn::SetAlignment( wxAlignment align )
xalign = 0.5;
gtk_tree_view_column_set_alignment( column, xalign );
if (m_renderer && m_renderer->GetAlignment() == -1)
m_renderer->GtkUpdateAlignment();
}
wxAlignment wxDataViewColumn::GetAlignment() const